add read receipts and typing notifications, closes #30

update deps
export MXID patterns parsing to external lib
2022-09-21 11:18:25 +03:00 · 2022-09-21 11:10:41 +03:00 · 2022-09-14 13:46:56 +03:00 · 2022-09-13 18:35:19 +03:00 · 2022-09-13 18:28:36 +03:00 · 2022-09-13 17:29:49 +03:00
33 changed files with 1216 additions and 543 deletions
--- a/README.md
+++ b/README.md
@@ -11,32 +11,47 @@ It can't be used with arbitrary email providers, but setup your own provider "wi

 ### Receive

- [x] SMTP server
+- [x] SMTP server (plaintext and SSL)
 - [x] Matrix bot
 - [x] Configuration in room's account data
 - [x] Receive emails to matrix rooms
 - [x] Receive attachments
 - [x] Map email threads to matrix threads

+#### deep dive
+
+> features in that section considered as "nice to have", but not a priority
+
+- [ ] DKIM verification
+- [ ] SPF verification
+- [ ] DMARC verification
+- [ ] Blocklists 
+
 ### Send

- [ ] SMTP client
+- [x] SMTP client
+- [x] Send a message to matrix room with special format to send a new email
 - [ ] Reply to matrix thread sends reply into email thread
- [ ] Send a message to matrix room with special format to send a new email

 ## Configuration

+### 1. Bot (mandatory)
+
 env vars

 * **POSTMOOGLE_HOMESERVER** - homeserver url, eg: `https://matrix.example.com`
 * **POSTMOOGLE_LOGIN** - user login/localpart, eg: `moogle`
 * **POSTMOOGLE_PASSWORD** - user password
 * **POSTMOOGLE_DOMAIN** - SMTP domain to listen for new emails
-* **POSTMOOGLE_PORT** - SMTP port to listen for new emails

 <details>
 <summary>other optional config parameters</summary>

+* **POSTMOOGLE_PORT** - SMTP port to listen for new emails
+* **POSTMOOGLE_TLS_PORT** - secure SMTP port to listen for new emails. Requires valid cert and key as well
+* **POSTMOOGLE_TLS_CERT** - path to your SSL certificate (chain)
+* **POSTMOOGLE_TLS_KEY** - path to your SSL certificate's private key
+* **POSTMOOGLE_TLS_REQUIRED** - require TLS connection, **even** on the non-TLS port (`POSTMOOGLE_PORT`). TLS connections are always required on the TLS port (`POSTMOOGLE_TLS_PORT`) regardless of this setting.
 * **POSTMOOGLE_NOENCRYPTION** - disable encryption support
 * **POSTMOOGLE_STATUSMSG** - presence status message
 * **POSTMOOGLE_SENTRY_DSN** - sentry DSN
@@ -45,12 +60,163 @@ env vars
 * **POSTMOOGLE_DB_DIALECT** - database dialect (postgres, sqlite3)
 * **POSTMOOGLE_MAXSIZE** - max email size (including attachments) in megabytes
 * **POSTMOOGLE_ADMINS** - a space-separated list of admin users. See `POSTMOOGLE_USERS` for syntax examples
-* <s>**POSTMOOGLE_USERS**</s> - deprecated and ignored, use `!pm users` instead

 You can find default values in [config/defaults.go](config/defaults.go)

 </details>

+### 2. DNS (optional)
+
+The following configuration is needed only if you want to send outgoing emails via Postmoogle (it's not necessary if you only want to receive emails).
+
+<details>
+<summary>TL;DR</summary>
+
+1. Configure DMARC record
+2. Configure SPF record
+3. Configure MX record
+4. Configure DKIM record (use `!pm dkim`)
+
+</details>
+
+**First**, add a new DMARC DNS record of the `TXT` type for subdomain `_dmarc` with a proper policy. The simplest policy you can use is: `v=DMARC1; p=quarantine;`.
+
+<details>
+<summary>Example</summary>
+
+```bash
+$ dig txt _dmarc.example.com
+
+; <<>> DiG 9.18.6 <<>> txt _dmarc.example.com
+;; global options: +cmd
+;; Got answer:
+;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 57306
+;; flags: qr rd ra; QUERY: 1, ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 1
+
+;; OPT PSEUDOSECTION:
+; EDNS: version: 0, flags:; udp: 1232
+;; QUESTION SECTION:
+;_dmarc.example.com.			IN	TXT
+
+;; ANSWER SECTION:
+_dmarc.example.com.		1799	IN	TXT	"v=DMARC1; p=quarantine;"
+
+;; Query time: 46 msec
+;; SERVER: 1.1.1.1#53(1.1.1.1) (UDP)
+;; WHEN: Sun Sep 04 21:31:30 EEST 2022
+;; MSG SIZE  rcvd: 79
+```
+
+</details>
+
+**Second**, add a new SPF DNS record of the `TXT` type for your domain that will be used with Postmoogle, with format: `v=spf1 ip4:SERVER_IP -all` (replace `SERVER_IP` with your server's IP address)
+
+<details>
+<summary>Example</summary>
+
+```bash
+$ dig txt example.com
+
+; <<>> DiG 9.18.6 <<>> txt example.com
+;; global options: +cmd
+;; Got answer:
+;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 24796
+;; flags: qr rd ra; QUERY: 1, ANSWER: 4, AUTHORITY: 0, ADDITIONAL: 1
+
+;; OPT PSEUDOSECTION:
+; EDNS: version: 0, flags:; udp: 1232
+;; QUESTION SECTION:
+;example.com.			IN	TXT
+
+;; ANSWER SECTION:
+example.com.		1799	IN	TXT	"v=spf1 ip4:111.111.111.111 -all"
+
+;; Query time: 36 msec
+;; SERVER: 1.1.1.1#53(1.1.1.1) (UDP)
+;; WHEN: Sun Sep 04 21:35:04 EEST 2022
+;; MSG SIZE  rcvd: 255
+```
+
+</details>
+
+**Third**, add a new MX DNS record of the `MX` type for your domain that will be used with postmoogle. It should point to the same (sub-)domain.
+Looks odd, but some mail servers will refuse to interact with your mail server (and Postmoogle is already a mail server) without MX records.
+
+<details>
+<summary>Example</summary>
+
+```bash
+dig MX example.com
+
+; <<>> DiG 9.18.6 <<>> MX example.com
+;; global options: +cmd
+;; Got answer:
+;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 12688
+;; flags: qr rd ra; QUERY: 1, ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 1
+
+;; OPT PSEUDOSECTION:
+; EDNS: version: 0, flags:; udp: 1232
+;; QUESTION SECTION:
+;example.com.			IN	MX
+
+;; ANSWER SECTION:
+example.com.		1799	IN	MX	10 example.com.
+
+;; Query time: 40 msec
+;; SERVER: 1.1.1.1#53(1.1.1.1) (UDP)
+;; WHEN: Tue Sep 06 16:44:47 EEST 2022
+;; MSG SIZE  rcvd: 59
+```
+
+</details>
+
+**Fourth** (and the last one), add new DKIM DNS record of `TXT` type for subdomain `postmoogle._domainkey` that will be used with postmoogle.
+
+You can get that signature using the `!pm dkim` command:
+
+<details>
+<summary>!pm dkim</summary>
+
+DKIM signature is: `v=DKIM1; k=rsa; p=MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAxJVqmBHhK9FY93q1o3WEaP2GKMh/3LNMyvi1uSjOKxIyfWv685KxX1EUrbHakQRCTtUM7efKEsXsXBh+DQru2TE32yFpL9afA5BbHj3KePGFY8KJ2m0sQxbQcvn2KjJC0IQ15mk0rninPhtphU/2zLsd6e7Rl1m3L+9Osk320GbfDgSKjRPcSiwVMbLJpSOP0H0F3cIu+c1fHZHfmWy0O+us42C3HTLTlD779LTnQnKlAOQD/+DYYqz6TGGxEwUG2BRQ8O8w7/wXEkg/6a/MxNtPnc59g29CpqRsDkuYiR3UIpqzLDoqHlaoKNbYy34R+4aIjfNpmZyR5kIumws+3MJtJt9UhBTMloqd8lZDPaPmX2NEDqbcSTkHMQrphk+EWSCc7OvbKRaXZ0SyJLpLjxRwKrpeO0JAI0ZpnAFS11uBEe9GSS8uzIIFNYVD1vHloAFKvUJEhyuVyz9/SyqTnArN3ZTiC5cqD1MB86q5QPrKqZfp1dAnv7xAJThL0AP/AgMBAAE=`.
+You need to add it to your DNS records (if not already):
+Add new DNS record with type = `TXT`, key (subdomain/from): `postmoogle._domainkey` and value (to):
+
+```
+v=DKIM1; k=rsa; p=MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAxJVqmBHhK9FY93q1o3WEaP2GKMh/3LNMyvi1uSjOKxIyfWv685KxX1EUrbHakQRCTtUM7efKEsXsXBh+DQru2TE32yFpL9afA5BbHj3KePGFY8KJ2m0sQxbQcvn2KjJC0IQ15mk0rninPhtphU/2zLsd6e7Rl1m3L+9Osk320GbfDgSKjRPcSiwVMbLJpSOP0H0F3cIu+c1fHZHfmWy0O+us42C3HTLTlD779LTnQnKlAOQD/+DYYqz6TGGxEwUG2BRQ8O8w7/wXEkg/6a/MxNtPnc59g29CpqRsDkuYiR3UIpqzLDoqHlaoKNbYy34R+4aIjfNpmZyR5kIumws+3MJtJt9UhBTMloqd8lZDPaPmX2NEDqbcSTkHMQrphk+EWSCc7OvbKRaXZ0SyJLpLjxRwKrpeO0JAI0ZpnAFS11uBEe9GSS8uzIIFNYVD1vHloAFKvUJEhyuVyz9/SyqTnArN3ZTiC5cqD1MB86q5QPrKqZfp1dAnv7xAJThL0AP/AgMBAAE=
+```
+
+Without that record other email servers may reject your emails as spam, kupo.
+
+</details>
+
+<details>
+<summary>Example</summary>
+
+```bash
+$ dig TXT postmoogle._domainkey.example.com
+
+; <<>> DiG 9.18.6 <<>> TXT postmoogle._domainkey.example.com
+;; global options: +cmd
+;; Got answer:
+;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 59014
+;; flags: qr rd ra; QUERY: 1, ANSWER: 2, AUTHORITY: 0, ADDITIONAL: 1
+
+;; OPT PSEUDOSECTION:
+; EDNS: version: 0, flags:; udp: 1232
+;; QUESTION SECTION:
+;postmoogle._domainkey.example.com.	IN	TXT
+
+;; ANSWER SECTION:
+postmoogle._domainkey.example.com. 600	IN TXT  "v=DKIM1; k=rsa; p=MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAxJVqmBHhK9FY93q1o3WEaP2GKMh/3LNMyvi1uSjOKxIyfWv685KxX1EUrbHakQRCTtUM7efKEsXsXBh+DQru2TE32yFpL9afA5BbHj3KePGFY8KJ2m0sQxbQcvn2KjJC0IQ15mk0rninPhtphU/2zLsd6e7Rl1m3L+9Osk320GbfDgSKjRPcSiwVMbLJpSOP0H0F3cIu+c1fHZHfmWy0O+us42C3HTLTlD779LTnQnKlAOQD/+DYYqz6TGGxEwUG2BRQ8O8w7/wXEkg/6a/MxNtPnc59g29CpqRsDkuYiR3UIpqzLDoqHlaoKNbYy34R+4aIjfNpmZyR5kIumws+3MJtJt9UhBTMloqd8lZDPaPmX2NEDqbcSTkHMQrphk+EWSCc7OvbKRaXZ0SyJLpLjxRwKrpeO0JAI0ZpnAFS11uBEe9GSS8uzIIFNYVD1vHloAFKvUJEhyuVyz9/SyqTnArN3ZTiC5cqD1MB86q5QPrKqZfp1dAnv7xAJThL0AP/AgMBAAE="
+
+;; Query time: 90 msec
+;; SERVER: 1.1.1.1#53(1.1.1.1) (UDP)
+;; WHEN: Mon Sep 05 16:16:21 EEST 2022
+;; MSG SIZE  rcvd: 525
+```
+
+</details>
+
 ## Usage

 ### How to start
@@ -82,8 +248,9 @@ If you want to change them - check available options in the help message (`!pm h

 ---

-* **!pm mailboxes** - Show the list of all mailboxes
+* **!pm dkim** - Get DKIM signature
 * **!pm users** - Get or set allowed users patterns
+* **!pm mailboxes** - Show the list of all mailboxes
 * **!pm delete** &lt;mailbox&gt; - Delete specific mailbox

 </details>
--- a/bot/access.go
+++ b/bot/access.go
@@ -4,9 +4,8 @@ import (
 	"context"
 	"regexp"

+	"gitlab.com/etke.cc/go/mxidwc"
 	"maunium.net/go/mautrix/id"
-
-	"gitlab.com/etke.cc/postmoogle/utils"
 )

 func parseMXIDpatterns(patterns []string, defaultPattern string) ([]*regexp.Regexp, error) {
@@ -14,7 +13,17 @@ func parseMXIDpatterns(patterns []string, defaultPattern string) ([]*regexp.Rege
 		patterns = []string{defaultPattern}
 	}

-	return utils.WildcardMXIDsToRegexes(patterns)
+	return mxidwc.ParsePatterns(patterns)
+}
+
+func (b *Bot) allowUsers(actorID id.UserID) bool {
+	if len(b.allowedUsers) != 0 {
+		if !mxidwc.Match(actorID.String(), b.allowedUsers) {
+			return false
+		}
+	}
+
+	return true
 }

 func (b *Bot) allowAnyone(actorID id.UserID, targetRoomID id.RoomID) bool {
@@ -22,12 +31,9 @@ func (b *Bot) allowAnyone(actorID id.UserID, targetRoomID id.RoomID) bool {
 }

 func (b *Bot) allowOwner(actorID id.UserID, targetRoomID id.RoomID) bool {
-	if len(b.allowedUsers) != 0 {
-		if !utils.Match(actorID.String(), b.allowedUsers) {
-			return false
-		}
+	if !b.allowUsers(actorID) {
+		return false
 	}
-
 	cfg, err := b.getRoomSettings(targetRoomID)
 	if err != nil {
 		b.Error(context.Background(), targetRoomID, "failed to retrieve settings: %v", err)
@@ -43,5 +49,19 @@ func (b *Bot) allowOwner(actorID id.UserID, targetRoomID id.RoomID) bool {
 }

 func (b *Bot) allowAdmin(actorID id.UserID, targetRoomID id.RoomID) bool {
-	return utils.Match(actorID.String(), b.allowedAdmins)
+	return mxidwc.Match(actorID.String(), b.allowedAdmins)
+}
+
+func (b *Bot) allowSend(actorID id.UserID, targetRoomID id.RoomID) bool {
+	if !b.allowUsers(actorID) {
+		return false
+	}
+
+	cfg, err := b.getRoomSettings(targetRoomID)
+	if err != nil {
+		b.Error(context.Background(), targetRoomID, "failed to retrieve settings: %v", err)
+		return false
+	}
+
+	return !cfg.NoSend()
 }
--- a/bot/bot.go
+++ b/bot/bot.go
@@ -13,6 +13,8 @@ import (
 	"maunium.net/go/mautrix/event"
 	"maunium.net/go/mautrix/format"
 	"maunium.net/go/mautrix/id"
+
+	"gitlab.com/etke.cc/postmoogle/utils"
 )

 // Bot represents matrix bot
@@ -25,6 +27,7 @@ type Bot struct {
 	rooms                   sync.Map
 	botcfg                  cache.Cache[botSettings]
 	cfg                     cache.Cache[roomSettings]
+	mta                     utils.MTA
 	log                     *logger.Logger
 	lp                      *linkpearl.Linkpearl
 	mu                      map[id.RoomID]*sync.Mutex
@@ -37,7 +40,6 @@ func New(
 	log *logger.Logger,
 	prefix string,
 	domain string,
-	envUsers []string,
 	admins []string,
 ) (*Bot, error) {
 	b := &Bot{
@@ -50,7 +52,7 @@ func New(
 		lp:     lp,
 		mu:     map[id.RoomID]*sync.Mutex{},
 	}
-	users, err := b.initBotUsers(envUsers)
+	users, err := b.initBotUsers()
 	if err != nil {
 		return nil, err
 	}
@@ -66,7 +68,7 @@ func New(
 	}
 	b.allowedAdmins = allowedAdmins

-	b.commands = b.buildCommandList()
+	b.commands = b.initCommands()

 	return b, nil
 }
@@ -78,7 +80,7 @@ func (b *Bot) Error(ctx context.Context, roomID id.RoomID, message string, args

 	sentry.GetHubFromContext(ctx).CaptureException(err)
 	if roomID != "" {
-		b.SendError(ctx, roomID, message)
+		b.SendError(ctx, roomID, err.Error())
 	}
 }

--- a/bot/command.go
+++ b/bot/command.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"strings"
+	"time"

 	"maunium.net/go/mautrix/event"
 	"maunium.net/go/mautrix/id"
@@ -14,6 +15,8 @@ import (
 const (
 	commandHelp      = "help"
 	commandStop      = "stop"
+	commandSend      = "send"
+	commandDKIM      = "dkim"
 	commandUsers     = botOptionUsers
 	commandDelete    = "delete"
 	commandMailboxes = "mailboxes"
@@ -38,7 +41,7 @@ func (c commandList) get(key string) *command {
 	return nil
 }

-func (b *Bot) buildCommandList() commandList {
+func (b *Bot) initCommands() commandList {
 	return commandList{
 		// special commands
 		{
@@ -51,6 +54,11 @@ func (b *Bot) buildCommandList() commandList {
 			description: "Disable bridge for the room and clear all configuration",
 			allowed:     b.allowOwner,
 		},
+		{
+			key:         commandSend,
+			description: "Send email",
+			allowed:     b.allowSend,
+		},
 		{allowed: b.allowOwner}, // delimiter
 		// options commands
 		{
@@ -66,6 +74,15 @@ func (b *Bot) buildCommandList() commandList {
 			allowed:     b.allowOwner,
 		},
 		{allowed: b.allowOwner}, // delimiter
+		{
+			key: roomOptionNoSend,
+			description: fmt.Sprintf(
+				"Get or set `%s` of the room (`true` - enable email sending; `false` - disable email sending)",
+				roomOptionNoSend,
+			),
+			sanitizer: utils.SanitizeBoolString,
+			allowed:   b.allowOwner,
+		},
 		{
 			key: roomOptionNoSender,
 			description: fmt.Sprintf(
@@ -117,6 +134,11 @@ func (b *Bot) buildCommandList() commandList {
 			description: "Get or set allowed users",
 			allowed:     b.allowAdmin,
 		},
+		{
+			key:         commandDKIM,
+			description: "Get DKIM signature",
+			allowed:     b.allowAdmin,
+		},
 		{
 			key:         commandMailboxes,
 			description: "Show the list of all mailboxes",
@@ -135,6 +157,11 @@ func (b *Bot) handleCommand(ctx context.Context, evt *event.Event, commandSlice
 	if cmd == nil {
 		return
 	}
+	_, err := b.lp.GetClient().UserTyping(evt.RoomID, true, 30*time.Second)
+	if err != nil {
+		b.log.Error("cannot send typing notification: %v", err)
+	}
+	defer b.lp.GetClient().UserTyping(evt.RoomID, false, 30*time.Second) //nolint:errcheck

 	if !cmd.allowed(evt.Sender, evt.RoomID) {
 		b.SendNotice(ctx, evt.RoomID, "not allowed to do that, kupo")
@@ -146,6 +173,10 @@ func (b *Bot) handleCommand(ctx context.Context, evt *event.Event, commandSlice
 		b.sendHelp(ctx)
 	case commandStop:
 		b.runStop(ctx)
+	case commandSend:
+		b.runSend(ctx)
+	case commandDKIM:
+		b.runDKIM(ctx, commandSlice)
 	case commandUsers:
 		b.runUsers(ctx, commandSlice)
 	case commandDelete:
@@ -157,7 +188,7 @@ func (b *Bot) handleCommand(ctx context.Context, evt *event.Event, commandSlice
 	}
 }

-func (b *Bot) parseCommand(message string) []string {
+func (b *Bot) parseCommand(message string, toLower bool) []string {
 	if message == "" {
 		return nil
 	}
@@ -167,8 +198,11 @@ func (b *Bot) parseCommand(message string) []string {
 		return nil
 	}

-	message = strings.ToLower(strings.TrimSpace(strings.Replace(message, b.prefix, "", 1)))
-	return strings.Split(message, " ")
+	message = strings.Replace(message, b.prefix, "", 1)
+	if toLower {
+		message = strings.ToLower(message)
+	}
+	return strings.Split(strings.TrimSpace(message), " ")
 }

 func (b *Bot) sendIntroduction(ctx context.Context, roomID id.RoomID) {
@@ -181,7 +215,7 @@ func (b *Bot) sendIntroduction(ctx context.Context, roomID id.RoomID) {
 	msg.WriteString(b.prefix)
 	msg.WriteString(" ")
 	msg.WriteString(roomOptionMailbox)
-	msg.WriteString("` command.\n")
+	msg.WriteString(" SOME_INBOX` command.\n")

 	msg.WriteString("You will then be able to send emails to `SOME_INBOX@")
 	msg.WriteString(b.domain)
@@ -237,3 +271,50 @@ func (b *Bot) sendHelp(ctx context.Context) {

 	b.SendNotice(ctx, evt.RoomID, msg.String())
 }
+
+func (b *Bot) runSend(ctx context.Context) {
+	evt := eventFromContext(ctx)
+	if !b.allowSend(evt.Sender, evt.RoomID) {
+		return
+	}
+	commandSlice := b.parseCommand(evt.Content.AsMessage().Body, false)
+	to, subject, body, err := utils.ParseSend(commandSlice)
+	if err == utils.ErrInvalidArgs {
+		b.SendNotice(ctx, evt.RoomID, fmt.Sprintf(
+			"Usage:\n"+
+				"```\n"+
+				"%s send someone@example.com\n"+
+				"Subject goes here on a line of its own\n"+
+				"Email content goes here\n"+
+				"on as many lines\n"+
+				"as you want.\n"+
+				"```",
+			b.prefix))
+		return
+	}
+
+	cfg, err := b.getRoomSettings(evt.RoomID)
+	if err != nil {
+		b.Error(ctx, evt.RoomID, "failed to retrieve room settings: %v", err)
+		return
+	}
+
+	mailbox := cfg.Mailbox()
+	if mailbox == "" {
+		b.SendNotice(ctx, evt.RoomID, "mailbox is not configured, kupo")
+		return
+	}
+
+	from := mailbox + "@" + b.domain
+	ID := fmt.Sprintf("<%s@%s>", evt.ID, b.domain)
+	data := utils.
+		NewEmail(ID, "", subject, from, to, body, "", nil).
+		Compose(b.getBotSettings().DKIMPrivateKey())
+	err = b.mta.Send(from, to, data)
+	if err != nil {
+		b.Error(ctx, evt.RoomID, "cannot send email: %v", err)
+		return
+	}
+
+	b.SendNotice(ctx, evt.RoomID, "Email has been sent")
+}
--- a/bot/command_admin.go
+++ b/bot/command_admin.go
@@ -6,6 +6,7 @@ import (
 	"sort"
 	"strings"

+	"gitlab.com/etke.cc/go/secgen"
 	"maunium.net/go/mautrix/id"

 	"gitlab.com/etke.cc/postmoogle/utils"
@@ -130,3 +131,38 @@ func (b *Bot) runUsers(ctx context.Context, commandSlice []string) {
 	b.allowedUsers = allowedUsers
 	b.SendNotice(ctx, evt.RoomID, "allowed users updated")
 }
+
+func (b *Bot) runDKIM(ctx context.Context, commandSlice []string) {
+	evt := eventFromContext(ctx)
+	cfg := b.getBotSettings()
+	if len(commandSlice) > 1 && commandSlice[1] == "reset" {
+		cfg.Set(botOptionDKIMPrivateKey, "")
+		cfg.Set(botOptionDKIMSignature, "")
+	}
+
+	signature := cfg.DKIMSignature()
+	if signature == "" {
+		var private string
+		var derr error
+		signature, private, derr = secgen.DKIM()
+		if derr != nil {
+			b.Error(ctx, evt.RoomID, "cannot generate DKIM signature: %v", derr)
+			return
+		}
+		cfg.Set(botOptionDKIMSignature, signature)
+		cfg.Set(botOptionDKIMPrivateKey, private)
+		err := b.setBotSettings(cfg)
+		if err != nil {
+			b.Error(ctx, evt.RoomID, "cannot save bot options: %v", err)
+			return
+		}
+	}
+
+	b.SendNotice(ctx, evt.RoomID, fmt.Sprintf(
+		"DKIM signature is: `%s`.\n"+
+			"You need to add it to your DNS records (if not already):\n"+
+			"Add new DNS record with type = `TXT`, key (subdomain/from): `postmoogle._domainkey` and value (to):\n ```\n%s\n```\n"+
+			"Without that record other email servers may reject your emails as spam, kupo.\n"+
+			"To reset the signature, send `%s dkim reset`",
+		signature, signature, b.prefix))
+}
--- a/bot/command_owner.go
+++ b/bot/command_owner.go
@@ -48,7 +48,10 @@ func (b *Bot) getOption(ctx context.Context, name string) {

 	value := cfg.Get(name)
 	if value == "" {
-		b.SendNotice(ctx, evt.RoomID, fmt.Sprintf("`%s` is not set, kupo.", name))
+		msg := fmt.Sprintf("`%s` is not set, kupo.\n"+
+			"To set it, send a `%s %s VALUE` command.",
+			name, b.prefix, name)
+		b.SendNotice(ctx, evt.RoomID, msg)
 		return
 	}

@@ -56,7 +59,10 @@ func (b *Bot) getOption(ctx context.Context, name string) {
 		value = value + "@" + b.domain
 	}

-	b.SendNotice(ctx, evt.RoomID, fmt.Sprintf("`%s` of this room is `%s`", name, value))
+	msg := fmt.Sprintf("`%s` of this room is `%s`\n"+
+		"To set it to a new value, send a `%s %s VALUE` command.",
+		name, value, b.prefix, name)
+	b.SendNotice(ctx, evt.RoomID, msg)
 }

 func (b *Bot) setOption(ctx context.Context, name, value string) {
@@ -98,9 +104,5 @@ func (b *Bot) setOption(ctx context.Context, name, value string) {
 		return
 	}

-	if name == roomOptionMailbox {
-		value = value + "@" + b.domain
-	}
-
 	b.SendNotice(ctx, evt.RoomID, fmt.Sprintf("`%s` of this room set to `%s`", name, value))
 }
--- a/bot/data.go
+++ b/bot/data.go
@@ -37,7 +37,6 @@ func (b *Bot) syncRooms() error {
 		return err
 	}
 	for _, roomID := range resp.JoinedRooms {
-		b.migrateSettings(roomID)
 		cfg, serr := b.getRoomSettings(roomID)
 		if serr != nil {
 			b.log.Warn("cannot get %s settings: %v", roomID, err)
--- a/bot/email.go
+++ b/bot/email.go
@@ -3,53 +3,32 @@ package bot
 import (
 	"context"
 	"errors"
+	"fmt"
 	"strings"

 	"maunium.net/go/mautrix/event"
-	"maunium.net/go/mautrix/format"
 	"maunium.net/go/mautrix/id"

 	"gitlab.com/etke.cc/postmoogle/utils"
 )

-// account data key
-const acMessagePrefix = "cc.etke.postmoogle.message"
+// account data keys
+const (
+	acMessagePrefix   = "cc.etke.postmoogle.message"
+	acLastEventPrefix = "cc.etke.postmoogle.last"
+)

 // event keys
 const (
 	eventMessageIDkey = "cc.etke.postmoogle.messageID"
 	eventInReplyToKey = "cc.etke.postmoogle.inReplyTo"
+	eventSubjectKey   = "cc.etke.postmoogle.subject"
+	eventFromKey      = "cc.etke.postmoogle.from"
 )

-func email2content(email *utils.Email, cfg roomSettings, threadID id.EventID) *event.Content {
-	var text strings.Builder
-	if !cfg.NoSender() {
-		text.WriteString("From: ")
-		text.WriteString(email.From)
-		text.WriteString("\n\n")
-	}
-	if !cfg.NoSubject() {
-		text.WriteString("# ")
-		text.WriteString(email.Subject)
-		text.WriteString("\n\n")
-	}
-	if email.HTML != "" && !cfg.NoHTML() {
-		text.WriteString(format.HTMLToMarkdown(email.HTML))
-	} else {
-		text.WriteString(email.Text)
-	}
-
-	parsed := format.RenderMarkdown(text.String(), true, true)
-	parsed.RelatesTo = utils.RelatesTo(cfg.NoThreads(), threadID)
-
-	content := event.Content{
-		Raw: map[string]interface{}{
-			eventMessageIDkey: email.MessageID,
-			eventInReplyToKey: email.InReplyTo,
-		},
-		Parsed: parsed,
-	}
-	return &content
+// SetMTA sets mail transfer agent instance to the bot
+func (b *Bot) SetMTA(mta utils.MTA) {
+	b.mta = mta
 }

 // GetMapping returns mapping of mailbox = room
@@ -67,7 +46,7 @@ func (b *Bot) GetMapping(mailbox string) (id.RoomID, bool) {
 }

 // Send email to matrix room
-func (b *Bot) Send(ctx context.Context, email *utils.Email) error {
+func (b *Bot) Send2Matrix(ctx context.Context, email *utils.Email) error {
 	roomID, ok := b.GetMapping(utils.Mailbox(email.To))
 	if !ok {
 		return errors.New("room not found")
@@ -87,8 +66,7 @@ func (b *Bot) Send(ctx context.Context, email *utils.Email) error {
 			b.setThreadID(roomID, email.MessageID, threadID)
 		}
 	}
-
-	content := email2content(email, cfg, threadID)
+	content := email.Content(threadID, cfg.ContentOptions())
 	eventID, serr := b.lp.Send(roomID, content)
 	if serr != nil {
 		return utils.UnwrapError(serr)
@@ -98,6 +76,7 @@ func (b *Bot) Send(ctx context.Context, email *utils.Email) error {
 		b.setThreadID(roomID, email.MessageID, eventID)
 		threadID = eventID
 	}
+	b.setLastEventID(roomID, threadID, eventID)

 	if !cfg.NoFiles() {
 		b.sendFiles(ctx, roomID, email.Files, cfg.NoThreads(), threadID)
@@ -105,6 +84,84 @@ func (b *Bot) Send(ctx context.Context, email *utils.Email) error {
 	return nil
 }

+func (b *Bot) getParentEmail(evt *event.Event) (string, string, string) {
+	content := evt.Content.AsMessage()
+	parentID := utils.EventParent(evt.ID, content)
+	if parentID == evt.ID {
+		return "", "", ""
+	}
+	parentID = b.getLastEventID(evt.RoomID, parentID)
+	parentEvt, err := b.lp.GetClient().GetEvent(evt.RoomID, parentID)
+	if err != nil {
+		b.log.Error("cannot get parent event: %v", err)
+		return "", "", ""
+	}
+	if parentEvt.Content.Parsed == nil {
+		perr := parentEvt.Content.ParseRaw(event.EventMessage)
+		if perr != nil {
+			b.log.Error("cannot parse event content: %v", perr)
+			return "", "", ""
+		}
+	}
+
+	to := utils.EventField[string](&parentEvt.Content, eventFromKey)
+	inReplyTo := utils.EventField[string](&parentEvt.Content, eventMessageIDkey)
+	if inReplyTo == "" {
+		inReplyTo = parentID.String()
+	}
+
+	subject := utils.EventField[string](&parentEvt.Content, eventSubjectKey)
+	if subject != "" {
+		subject = "Re: " + subject
+	} else {
+		subject = strings.SplitN(content.Body, "\n", 1)[0]
+	}
+
+	return to, inReplyTo, subject
+}
+
+// Send2Email sends message to email
+// TODO rewrite to thread replies only
+func (b *Bot) Send2Email(ctx context.Context, to, subject, body string) error {
+	var inReplyTo string
+	evt := eventFromContext(ctx)
+	cfg, err := b.getRoomSettings(evt.RoomID)
+	if err != nil {
+		return err
+	}
+	mailbox := cfg.Mailbox()
+	if mailbox == "" {
+		return fmt.Errorf("mailbox not configured, kupo")
+	}
+	from := mailbox + "@" + b.domain
+	pTo, pInReplyTo, pSubject := b.getParentEmail(evt)
+	inReplyTo = pInReplyTo
+	if pTo != "" && to == "" {
+		to = pTo
+	}
+	if pSubject != "" && subject == "" {
+		subject = pSubject
+	}
+
+	content := evt.Content.AsMessage()
+	if subject == "" {
+		subject = strings.SplitN(content.Body, "\n", 1)[0]
+	}
+	if body == "" {
+		if content.FormattedBody != "" {
+			body = content.FormattedBody
+		} else {
+			body = content.Body
+		}
+	}
+
+	ID := evt.ID.String()[1:] + "@" + b.domain
+	data := utils.
+		NewEmail(ID, inReplyTo, subject, from, to, body, "", nil).
+		Compose(b.getBotSettings().DKIMPrivateKey())
+	return b.mta.Send(from, to, data)
+}
+
 func (b *Bot) sendFiles(ctx context.Context, roomID id.RoomID, files []*utils.File, noThreads bool, parentID id.EventID) {
 	for _, file := range files {
 		req := file.Convert()
@@ -114,10 +171,10 @@ func (b *Bot) sendFiles(ctx context.Context, roomID id.RoomID, files []*utils.Fi
 			continue
 		}
 		_, err = b.lp.Send(roomID, &event.MessageEventContent{
-			MsgType:   event.MsgFile,
+			MsgType:   file.MsgType,
 			Body:      req.FileName,
 			URL:       resp.ContentURI.CUString(),
-			RelatesTo: utils.RelatesTo(noThreads, parentID),
+			RelatesTo: utils.RelatesTo(!noThreads, parentID),
 		})
 		if err != nil {
 			b.Error(ctx, roomID, "cannot send uploaded file %s: %v", req.FileName, err)
@@ -152,3 +209,31 @@ func (b *Bot) setThreadID(roomID id.RoomID, messageID string, eventID id.EventID
 		}
 	}
 }
+
+func (b *Bot) getLastEventID(roomID id.RoomID, threadID id.EventID) id.EventID {
+	key := acLastEventPrefix + "." + threadID.String()
+	data := map[string]id.EventID{}
+	err := b.lp.GetClient().GetRoomAccountData(roomID, key, &data)
+	if err != nil {
+		if !strings.Contains(err.Error(), "M_NOT_FOUND") {
+			b.log.Error("cannot retrieve account data %s: %v", key, err)
+			return threadID
+		}
+	}
+
+	return data["eventID"]
+}
+
+func (b *Bot) setLastEventID(roomID id.RoomID, threadID id.EventID, eventID id.EventID) {
+	key := acLastEventPrefix + "." + threadID.String()
+	data := map[string]id.EventID{
+		"eventID": eventID,
+	}
+
+	err := b.lp.GetClient().SetRoomAccountData(roomID, key, data)
+	if err != nil {
+		if !strings.Contains(err.Error(), "M_NOT_FOUND") {
+			b.log.Error("cannot save account data %s: %v", key, err)
+		}
+	}
+}
--- a/bot/message.go
+++ b/bot/message.go
@@ -7,13 +7,18 @@ import (

 func (b *Bot) handle(ctx context.Context) {
 	evt := eventFromContext(ctx)
+	err := b.lp.GetClient().MarkRead(evt.RoomID, evt.ID)
+	if err != nil {
+		b.log.Error("cannot send read receipt: %v", err)
+	}
+
 	content := evt.Content.AsMessage()
 	if content == nil {
 		b.Error(ctx, evt.RoomID, "cannot read message")
 		return
 	}
 	message := strings.TrimSpace(content.Body)
-	cmd := b.parseCommand(message)
+	cmd := b.parseCommand(message, true)
 	if cmd == nil {
 		return
 	}
--- a/bot/mutext.go
+++ b/bot/mutext.go
--- a/bot/settings_bot.go
+++ b/bot/settings_bot.go
@@ -11,7 +11,9 @@ const acBotSettingsKey = "cc.etke.postmoogle.config"

 // bot options keys
 const (
-	botOptionUsers = "users"
+	botOptionUsers          = "users"
+	botOptionDKIMSignature  = "dkim.pub"
+	botOptionDKIMPrivateKey = "dkim.pem"
 )

 type botSettings map[string]string
@@ -40,25 +42,28 @@ func (s botSettings) Users() []string {
 	return []string{value}
 }

-func (b *Bot) initBotUsers(envUsers []string) ([]string, error) {
+// DKIMSignature (DNS TXT record)
+func (s botSettings) DKIMSignature() string {
+	return s.Get(botOptionDKIMSignature)
+}
+
+// DKIMPrivateKey keep it secret
+func (s botSettings) DKIMPrivateKey() string {
+	return s.Get(botOptionDKIMPrivateKey)
+}
+
+func (b *Bot) initBotUsers() ([]string, error) {
 	config := b.getBotSettings()
 	cfgUsers := config.Users()
 	if len(cfgUsers) > 0 {
-		// already migrated
 		return cfgUsers, nil
 	}
-	if len(envUsers) == 0 {
-		_, homeserver, err := b.lp.GetClient().UserID.Parse()
-		if err != nil {
-			return nil, err
-		}
-		config.Set(botOptionUsers, "@*:"+homeserver)
-	} else {
-		// Initialize from environment variable
-		// TODO: remove this migration later and always initialize to `"@*:"+homeserver`
-		config.Set(botOptionUsers, strings.Join(envUsers, " "))
-	}

+	_, homeserver, err := b.lp.GetClient().UserID.Parse()
+	if err != nil {
+		return nil, err
+	}
+	config.Set(botOptionUsers, "@*:"+homeserver)
 	return config.Users(), b.setBotSettings(config)
 }

--- a/bot/settings_room.go
+++ b/bot/settings_room.go
@@ -1,7 +1,6 @@
 package bot

 import (
-	"strconv"
 	"strings"

 	"maunium.net/go/mautrix/id"
@@ -16,6 +15,7 @@ const acRoomSettingsKey = "cc.etke.postmoogle.settings"
 const (
 	roomOptionOwner     = "owner"
 	roomOptionMailbox   = "mailbox"
+	roomOptionNoSend    = "nosend"
 	roomOptionNoSender  = "nosender"
 	roomOptionNoSubject = "nosubject"
 	roomOptionNoHTML    = "nohtml"
@@ -25,13 +25,6 @@ const (

 type roomSettings map[string]string

-// settingsOld of a room
-type settingsOld struct {
-	Mailbox  string
-	Owner    id.UserID
-	NoSender bool
-}
-
 // Get option
 func (s roomSettings) Get(key string) string {
 	return s[strings.ToLower(strings.TrimSpace(key))]
@@ -50,6 +43,10 @@ func (s roomSettings) Owner() string {
 	return s.Get(roomOptionOwner)
 }

+func (s roomSettings) NoSend() bool {
+	return utils.Bool(s.Get(roomOptionNoSend))
+}
+
 func (s roomSettings) NoSender() bool {
 	return utils.Bool(s.Get(roomOptionNoSender))
 }
@@ -70,26 +67,18 @@ func (s roomSettings) NoFiles() bool {
 	return utils.Bool(s.Get(roomOptionNoFiles))
 }

-// TODO: remove after migration
-func (b *Bot) migrateSettings(roomID id.RoomID) {
-	var config settingsOld
-	err := b.lp.GetClient().GetRoomAccountData(roomID, acRoomSettingsKey, &config)
-	if err != nil {
-		// any error = no need to migrate
-		return
-	}
+// ContentOptions converts room display settings to content options
+func (s roomSettings) ContentOptions() *utils.ContentOptions {
+	return &utils.ContentOptions{
+		HTML:    !s.NoHTML(),
+		Sender:  !s.NoSender(),
+		Subject: !s.NoSubject(),
+		Threads: !s.NoThreads(),

-	if config.Mailbox == "" {
-		return
-	}
-	cfg := roomSettings{}
-	cfg.Set(roomOptionMailbox, config.Mailbox)
-	cfg.Set(roomOptionOwner, config.Owner.String())
-	cfg.Set(roomOptionNoSender, strconv.FormatBool(config.NoSender))
-
-	err = b.setRoomSettings(roomID, cfg)
-	if err != nil {
-		b.log.Error("cannot migrate settings: %v", err)
+		FromKey:      eventFromKey,
+		SubjectKey:   eventSubjectKey,
+		MessageIDKey: eventMessageIDkey,
+		InReplyToKey: eventInReplyToKey,
 	}
 }

@@ -108,7 +97,9 @@ func (b *Bot) getRoomSettings(roomID id.RoomID) (roomSettings, error) {
 			// In such cases, just return a default (empty) settings object.
 			err = nil
 		}
-	} else {
+	}
+
+	if err == nil {
 		b.cfg.Set(roomID.String(), config)
 	}

--- a/bot/sync.go
+++ b/bot/sync.go
@@ -3,11 +3,14 @@ package bot
 import (
 	"context"

+	"gitlab.com/etke.cc/go/mxidwc"
 	"maunium.net/go/mautrix"
 	"maunium.net/go/mautrix/event"
 )

 func (b *Bot) initSync() {
+	b.lp.SetJoinPermit(b.joinPermit)
+
 	b.lp.OnEventType(
 		event.StateMember,
 		func(_ mautrix.EventSource, evt *event.Event) {
@@ -26,6 +29,16 @@ func (b *Bot) initSync() {
 		})
 }

+// joinPermit is called by linkpearl when processing "invite" events and deciding if rooms should be auto-joined or not
+func (b *Bot) joinPermit(evt *event.Event) bool {
+	if !mxidwc.Match(evt.Sender.String(), b.allowedUsers) {
+		b.log.Debug("Rejecting room invitation from unallowed user: %s", evt.Sender)
+		return false
+	}
+
+	return true
+}
+
 func (b *Bot) onMembership(evt *event.Event) {
 	ctx := newContext(evt)

--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -20,8 +20,9 @@ import (
 )

 var (
-	mxb *bot.Bot
-	log *logger.Logger
+	mxb      *bot.Bot
+	smtpserv *smtp.Server
+	log      *logger.Logger
 )

 func main() {
@@ -38,11 +39,13 @@ func main() {
 	log.Debug("starting internal components...")
 	initSentry(cfg)
 	initBot(cfg)
+	initSMTP(cfg)
 	initShutdown(quit)
 	defer recovery()

 	go startBot(cfg.StatusMsg)
-	if err := smtp.Start(cfg.Domain, cfg.Port, cfg.LogLevel, cfg.MaxSize, mxb); err != nil {
+
+	if err := smtpserv.Start(); err != nil {
 		//nolint:gocritic
 		log.Fatal("SMTP server crashed: %v", err)
 	}
@@ -83,7 +86,7 @@ func initBot(cfg *config.Config) {
 		log.Fatal("cannot initialize matrix bot: %v", err)
 	}

-	mxb, err = bot.New(lp, mxlog, cfg.Prefix, cfg.Domain, cfg.Users, cfg.Admins)
+	mxb, err = bot.New(lp, mxlog, cfg.Prefix, cfg.Domain, cfg.Admins)
 	if err != nil {
 		// nolint // Fatal = panic, not os.Exit()
 		log.Fatal("cannot start matrix bot: %v", err)
@@ -91,6 +94,20 @@ func initBot(cfg *config.Config) {
 	log.Debug("bot has been created")
 }

+func initSMTP(cfg *config.Config) {
+	smtpserv = smtp.NewServer(&smtp.Config{
+		Domain:      cfg.Domain,
+		Port:        cfg.Port,
+		TLSCert:     cfg.TLS.Cert,
+		TLSKey:      cfg.TLS.Key,
+		TLSPort:     cfg.TLS.Port,
+		TLSRequired: cfg.TLS.Required,
+		LogLevel:    cfg.LogLevel,
+		MaxSize:     cfg.MaxSize,
+		Bot:         mxb,
+	})
+}
+
 func initShutdown(quit chan struct{}) {
 	listener := make(chan os.Signal, 1)
 	signal.Notify(listener, os.Interrupt, syscall.SIGABRT, syscall.SIGHUP, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGTERM)
@@ -114,6 +131,7 @@ func startBot(statusMsg string) {

 func shutdown() {
 	log.Info("Shutting down...")
+	smtpserv.Stop()
 	mxb.Stop()

 	sentry.Flush(5 * time.Second)
--- a/config/config.go
+++ b/config/config.go
@@ -20,8 +20,13 @@ func New() *Config {
 		NoEncryption: env.Bool("noencryption"),
 		MaxSize:      env.Int("maxsize", defaultConfig.MaxSize),
 		StatusMsg:    env.String("statusmsg", defaultConfig.StatusMsg),
-		Users:        env.Slice("users"),
 		Admins:       env.Slice("admins"),
+		TLS: TLS{
+			Cert:     env.String("tls.cert", defaultConfig.TLS.Cert),
+			Key:      env.String("tls.key", defaultConfig.TLS.Key),
+			Required: env.Bool("tls.required"),
+			Port:     env.String("tls.port", defaultConfig.TLS.Port),
+		},
 		Sentry: Sentry{
 			DSN: env.String("sentry.dsn", defaultConfig.Sentry.DSN),
 		},
--- a/config/defaults.go
+++ b/config/defaults.go
@@ -11,4 +11,7 @@ var defaultConfig = &Config{
 		DSN:     "local.db",
 		Dialect: "sqlite3",
 	},
+	TLS: TLS{
+		Port: "587",
+	},
 }
--- a/config/types.go
+++ b/config/types.go
@@ -22,14 +22,15 @@ type Config struct {
 	MaxSize int
 	// StatusMsg of the bot
 	StatusMsg string
-	// Users DEPRECATED holds list of allowed users (wildcards supported), e.g.: @*:example.com, @bot.*:example.com, @admin:*. Empty = homeserver only
-	Users []string
 	// Admins holds list of admin users (wildcards supported), e.g.: @*:example.com, @bot.*:example.com, @admin:*. Empty = no admins
 	Admins []string

 	// DB config
 	DB DB

+	// TLS config
+	TLS TLS
+
 	// Sentry config
 	Sentry Sentry
 }
@@ -42,6 +43,14 @@ type DB struct {
 	Dialect string
 }

+// TLS config
+type TLS struct {
+	Cert     string
+	Key      string
+	Port     string
+	Required bool
+}
+
 // Sentry config
 type Sentry struct {
 	DSN string
--- a/e2e/cert.pem
+++ b/e2e/cert.pem
@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIUfzdKDYiYN1Q1oZ6sNbI5TahmQZwwDQYJKoZIhvcNAQEL
+BQAwOzELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxFzAVBgNVBAoM
+DlBvc3Rtb29nbGUgRGV2MCAXDTIyMDkxMzE0Mzc1MFoYDzIwNTEwMTI5MTQzNzUw
+WjA7MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEXMBUGA1UECgwO
+UG9zdG1vb2dsZSBEZXYwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDa
+RwXjxG2MYhx1XETSdCBqqDat4ilhApW9impk3M6piRmeEkwTIENpYks9YVjItE9m
+3OnhNDptnIrzGWUIO77xEITcFGwsqkmg3lYOdZHxCfEup9dqFwdY9jeGGQxZkLFw
+nWGcaXHW+qtCBD3shmquC2xftKGUnCrX81jrpvHj4JeY03ENbvolTjLyhgQcj8Fh
+KXsXBWGKOSoU/FIZjy/lhZp5sEdJz25XeT7ktbPTglZTFKL+CkSVdXnVpb1Hys2m
+aiYCFr62g4wZjRdGFYHCva/55LXydFoC+VtjYJ7ifnXkV6c0iSh+vj1k+QrV+/cJ
+A/kTPI2rIWFicYt09AFKf1//BjXsRfBF6DF8tj2RmZPxQfDBRvTQkhNm9FkmfNeF
+KSNsRiRTb7gILs8y2R4BBMdFMQtw6JIfVueMlBAmKGkyVcSeQFY7+bS/BycxLx/Z
+hFN5u3czE+rhS9Nb76ZV9AW1UpsE/8jnWk9B0lVBMz2e8xL0leq4tMDsN+zt+Esr
+IYGD1lKO/iLPWPNRIKQrnb3hyS2an7LeG+VdKaYT1/EyN+qY24EF7XoeOXeHJ+tl
+kPBtYrIZAMu111IyzI7A36IP6VYB9b0wPnnLBgpJAW3A3jW5W9tuMBDxHATuDHfA
+UoVZh7oagPeyIYaAtzJB/7BBfYrrb190VU0FT6SyYQIDAQABo1MwUTAdBgNVHQ4E
+FgQU1yjkuZAaJcrH1JMAY6iFqxoPDR8wHwYDVR0jBBgwFoAU1yjkuZAaJcrH1JMA
+Y6iFqxoPDR8wDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAJkus
+0wHrehTe0MKditkK/gb5+YGJqywZdhhwVZdK1JlbVAch/TpMn+3tD4GtToG/pN9h
+Id/jaLWl0y5/iytmupdOjcE1yLTlb9McUgBMHNbZ/QNFoTGlaeqIGTFK8QddAtYi
+VaGjDqBSKsAA/Ro1k98I7PWN6wb3nfkJO4/cDixErOSz7IBcdF7WiITnlpmdl8R7
+Xe2yfW6SVCbhNOsyKRUxz7hYgbak0OE1W4J6DTCdeX8Er7fMAmCjfrBQB8vQLs/Y
+5+PJMk6aTq31e7SQoOUe6HCGutnB7UOUjzynkHWeojGv1WwPxT8x53L263FZhdVJ
+vMfJNy1yie/qf90H7UG0LaPDF5CsLSV5iQY7pGXS/Qt1KV8OWsJpB2ZYZpQ24lwX
+X5KTQEB/YM0oCaLg50FgmuqGWqj2O7l5ey69Qz7+WnsT8NuTC/uYmuTnZqndn7IO
+5kWIX1uFWqqLMjirTAJQkecUIJEW324VYD8Ja0ylT8RReyR+ovZyMTS05pjbn5p4
+nA5Rni6hGWqj7HYxp4vI5zA8PyTwtn7Ls9zXSva4GIfXQyJd73VM8bZUl7R4lGoN
+GjdZArhEo+FPMDtFDYB8i+pBx8zZ0p6EVHWFJsuoiIwY5V9QNew2WusvuXTVSMzk
+kwoU0mIWLJVQtTelX1zvQVvs4PZa+iAzkniEjb0=
+-----END CERTIFICATE-----
--- a/e2e/key.pem
+++ b/e2e/key.pem
@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDaRwXjxG2MYhx1
+XETSdCBqqDat4ilhApW9impk3M6piRmeEkwTIENpYks9YVjItE9m3OnhNDptnIrz
+GWUIO77xEITcFGwsqkmg3lYOdZHxCfEup9dqFwdY9jeGGQxZkLFwnWGcaXHW+qtC
+BD3shmquC2xftKGUnCrX81jrpvHj4JeY03ENbvolTjLyhgQcj8FhKXsXBWGKOSoU
+/FIZjy/lhZp5sEdJz25XeT7ktbPTglZTFKL+CkSVdXnVpb1Hys2maiYCFr62g4wZ
+jRdGFYHCva/55LXydFoC+VtjYJ7ifnXkV6c0iSh+vj1k+QrV+/cJA/kTPI2rIWFi
+cYt09AFKf1//BjXsRfBF6DF8tj2RmZPxQfDBRvTQkhNm9FkmfNeFKSNsRiRTb7gI
+Ls8y2R4BBMdFMQtw6JIfVueMlBAmKGkyVcSeQFY7+bS/BycxLx/ZhFN5u3czE+rh
+S9Nb76ZV9AW1UpsE/8jnWk9B0lVBMz2e8xL0leq4tMDsN+zt+EsrIYGD1lKO/iLP
+WPNRIKQrnb3hyS2an7LeG+VdKaYT1/EyN+qY24EF7XoeOXeHJ+tlkPBtYrIZAMu1
+11IyzI7A36IP6VYB9b0wPnnLBgpJAW3A3jW5W9tuMBDxHATuDHfAUoVZh7oagPey
+IYaAtzJB/7BBfYrrb190VU0FT6SyYQIDAQABAoICAFbGgXrpLjvvDS1C/0FDVVfR
+g9tg295rLqhpjJ6Igcg4buy+jWvVGbedkhfWyXsQ47ga/we+wbOt1jeK0vWQ+vnO
+/WKY4+Bl2luPyFp7NwfCUhWgOC0+9nbRe4VeE+DPexswFgweh1lV0huuoAeV8Hc8
+p1rs7oesBgRQA/u7JNLZCKuC86DJi7yk9/Aegyfvpos/+GVQiFRxIV+yZ9ktaXcv
+xBe4kr6vLkisNOqrqc/eMv9YZuvjnRxl1YewGi2eXF9aN74A2NSqO1o1ExmTl0Ca
+NIl9+S9oPhiMlV5OnRuh9rBOgHSMSoMIklPABiTHxI/a+nxBSHjODm8agLx//Lqr
+Deqhl9yOB1IvEODT/4GJVLwGLZCFS+dD390p3a2+NBHAKM922IXexWxJkdxiEwC3
+3gicHvfGwU1eNPkbMJqb3QyJto+is9be1F3npLyffVwczJHeH5wLUOPexPNe4aRd
+Ag+++tnVf36luX7mzwME35vqOoDmdcrwmxDK3IsnOnMCZZbEiOQ3oqQwWoGK7OiL
+6adzoYTypdkdiozJVTz0xLxvZuUdwUydZswUVJeClEgyNk3c5Ln+jIjUwSMf9IqS
+HiiZOT9fYxgctMQ4mWeutABV0XvMaq3B2kJuyGdln5firAMDwzmvR4LeS0EW+lKa
+OxQQAqfBsqcBmc6G8GV5AoIBAQD1j7FEk2IeOqRaGbtH25VI4BkTw8KTuzK+5iHK
+Hjs5F8MPf2IbrjmpHTlANyLJ+IToc5LPDvy4TJRFOQKqge0BiZpS7ggp956y9Oyn
+1vtMkzHUrjHyjU9JzDMDe1+OrAGa/YwPWVZnjvBijS0OWmlYrnto5ZsN5XX9yJ2w
+7CZZPbXAbC9udtD9nc6fVXL3TB9Go/Wury8uwuAfah6ID9Jz6ta5kvhu1GdH7vKx
+zIXL8GS6qYPCPh8fimM02XlfONTEnFA2L6CW2eAKCs2GoF1kW8gWYMWErkGsR/40
+hBqNHBPphTuG7sypPpsHkmKE3tz+A0W5K+E6S9qlrMCF40wzAoIBAQDjjmpVoB7/
+IWDMsSf71LcxVgjZIM3bkL7misgL61WUk9Zq5Om5gTJd44w5nzdh56dGxEuQi3Br
+Du43NnmPiPBgtgvtgWxQx2uDIE2qaj8AQz2vNOMQaTDGZYNE0Wk65yg0Qn/CI/D5
+VL+O6n+CbF8duMXIuUbkakFp76BvfJqLAw9/YUp7AJTTtKjQbNum1X0mwbF9eAb7
+KIMciUrQ92jZ0aPobXlZ2BXOcbTxF3alxh0NPMCGEy8LV+2X+l3NFLuthGVKEyzL
+8vr/dtJykLqzLmW16VW5wOR3mdJe79DnOeW7IAPAPJSpZIdGJgnvAWmjjFbmZoyN
+XeBFjxeQDLMbAoIBAAXYXcfcGkHN84uRgTu8plkNvIsT5dXOZu7UW4mMHqzFPAdq
+aNNv2j+ESpCUv2c/WyqNVblICgv5Bq5/JOkaHqIivGGs+NTG6CgqXFfCbkjsWAtP
+jBj3LdM/QngLe4fegpObr8OyVe9t0shQSlOTaOmw5lDneU+yQg5dkd315HYPjNO
+X/KpMWBYGUsBpbLtRPFRhc+aq+zZBqy4wfFLLx9DP8k7Dl7U/4Be17gTvjuUhVFM
+J66/+82sZaAkbRcvKyFi9yXTDGeK2CJlD29c8dwpsyGVPB5kZ3vKWuq1GkyxlmfA
+nCIiHQ0KSHZtrZqsE2aYfVhjCwFwPMwkyJBnULECggEBAI8vj+1tIdP8FsL2PmiS
+AuvCbTLjF2WvgM/kR9hoLqOdGvCMNh2KFD1L73Jaoyix8WnwHnRHqWdUL8UCPB97
+VXYlVwANzjBOK3KJIxW2YQozRV838iDjb9OHEMB+3K45weyQY3+vyfO5xgeRusZA
+luFG4P1ayCb2TU7xf4xnZX9PX7MRbyJSzVMhfJAZz2T9NRDsFFkU65+icE3GfhNb
+etiEt5SLPi6wb5hFqEuELh5FuQYZUjOLYrDKlTBqVBe1khqvEmU4B5oVvKZ/CBEa
+zL/u1AVRW6XUoG45lkwyrsqwfcPvcyzFce3c2dnkGaAQzX4h0pSLtqlFhtd+IJ99
+vj0CggEBAJfdlbH2dlJB16DiVKFucnIdX4y+h4uv2ZlsVM7XUunsvnbN+PL7QYqD
+zgmVAV9/EKVJGxoFRiGe5rDTXP68PAELGDcetCPQGdYCVKYVlvOjjGDSvZwH+Ca1
+9Jig9gmW2ezdGkqqU4cptVdrmN07R+HNEp9ZnaSUVcLywA1jeCkRrsO55s7++VNC
+nHDfkEWwpRXMbcdFXnEC6IomOBxtY9LDCmWTJmWXhJqgPr9WDSMB37xlfxNUttap
+Ozzugp4UCywam1MgsJB5mueGN4ExfTQ5mnJw8TNmtuxaWeea+Lu7lwQrwwia30nL
+G9eNyx0/usGECLor9sfMmhy55arHNv8=
+-----END PRIVATE KEY-----
--- a/go.mod
+++ b/go.mod
@@ -4,16 +4,20 @@ go 1.18

 require (
 	git.sr.ht/~xn/cache/v2 v2.0.0
+	github.com/emersion/go-msgauth v0.6.6
 	github.com/emersion/go-smtp v0.15.0
+	github.com/gabriel-vasile/mimetype v1.4.1
 	github.com/getsentry/sentry-go v0.13.0
 	github.com/jhillyerd/enmime v0.10.0
 	github.com/lib/pq v1.10.6
-	github.com/mattn/go-sqlite3 v1.14.14
+	github.com/mattn/go-sqlite3 v1.14.15
 	gitlab.com/etke.cc/go/env v1.0.0
 	gitlab.com/etke.cc/go/logger v1.1.0
-	gitlab.com/etke.cc/linkpearl v0.0.0-20220826133247-10dcaedb8085
-	golang.org/x/net v0.0.0-20220822230855-b0a4917ee28c
-	maunium.net/go/mautrix v0.12.0
+	gitlab.com/etke.cc/go/mxidwc v1.0.0
+	gitlab.com/etke.cc/go/secgen v1.1.1
+	gitlab.com/etke.cc/linkpearl v0.0.0-20220921080011-9407dc599571
+	golang.org/x/net v0.0.0-20220920203100-d0c6ba3f52d9
+	maunium.net/go/mautrix v0.12.1
 )

 require (
@@ -27,18 +31,19 @@ require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/mattn/go-runewidth v0.0.12 // indirect
+	github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
-	github.com/rs/zerolog v1.27.0 // indirect
+	github.com/rs/zerolog v1.28.0 // indirect
 	github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
 	github.com/tidwall/gjson v1.14.3 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tidwall/sjson v1.2.5 // indirect
-	github.com/yuin/goldmark v1.4.12 // indirect
-	golang.org/x/crypto v0.0.0-20220824171710-5757bc0c5503 // indirect
-	golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64 // indirect
+	github.com/yuin/goldmark v1.4.13 // indirect
+	golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0 // indirect
+	golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
 	golang.org/x/text v0.3.7 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	maunium.net/go/maulogger/v2 v2.3.2 // indirect
--- a/go.sum
+++ b/go.sum
@@ -6,10 +6,20 @@ github.com/cention-sany/utf7 v0.0.0-20170124080048-26cad61bd60a/go.mod h1:2GxOXO
 github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/emersion/go-message v0.11.2/go.mod h1:C4jnca5HOTo4bGN9YdqNQM9sITuT3Y0K6bSUw9RklvY=
+github.com/emersion/go-message v0.15.0/go.mod h1:wQUEfE+38+7EW8p8aZ96ptg6bAb1iwdgej19uXASlE4=
+github.com/emersion/go-milter v0.3.3/go.mod h1:ablHK0pbLB83kMFBznp/Rj8aV+Kc3jw8cxzzmCNLIOY=
+github.com/emersion/go-msgauth v0.6.6 h1:buv5lL8v/3v4RpHnQFS2IPhE3nxSRX+AxnrEJbDbHhA=
+github.com/emersion/go-msgauth v0.6.6/go.mod h1:A+/zaz9bzukLM6tRWRgJ3BdrBi+TFKTvQ3fGMFOI9SM=
 github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21 h1:OJyUGMJTzHTd1XQp98QTaHernxMYzRaOasRir9hUlFQ=
 github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
 github.com/emersion/go-smtp v0.15.0 h1:3+hMGMGrqP/lqd7qoxZc1hTU8LY8gHV9RFGWlqSDmP8=
 github.com/emersion/go-smtp v0.15.0/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ=
+github.com/emersion/go-textwrapper v0.0.0-20160606182133-d0e65e56babe/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U=
+github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U=
+github.com/gabriel-vasile/mimetype v1.4.1 h1:TRWk7se+TOjCYgRth7+1/OYLNiRNIotknkFtf/dnN7Q=
+github.com/gabriel-vasile/mimetype v1.4.1/go.mod h1:05Vi0w3Y9c/lNvJOdmIwvrrAhX3rYhfQQCaf9VJcv7M=
 github.com/getsentry/sentry-go v0.13.0 h1:20dgTiUSfxRB/EhMPtxcL9ZEbM1ZdR+W/7f7NWD+xWo=
 github.com/getsentry/sentry-go v0.13.0/go.mod h1:EOsfu5ZdvKPfeHYV6pTVQnsjfp30+XA7//UooKNumH0=
 github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
@@ -30,6 +40,7 @@ github.com/jhillyerd/enmime v0.10.0 h1:DZEzhptPRBesvN3gf7K1BOh4rfpqdsdrEoxW1Edr/
 github.com/jhillyerd/enmime v0.10.0/go.mod h1:Qpe8EEemJMFAF8+NZoWdpXvK2Yb9dRF0k/z6mkcDHsA=
 github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs=
 github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/martinlindhe/base36 v1.0.0/go.mod h1:+AtEs8xrBpCeYgSLoY/aJ6Wf37jtBuR0s35750M27+8=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
@@ -39,8 +50,10 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.12 h1:Y41i/hVW3Pgwr8gV+J23B9YEY0zxjptBuCWEaxmAOow=
 github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
-github.com/mattn/go-sqlite3 v1.14.14 h1:qZgc/Rwetq+MtyE18WhzjokPD93dNqLGNT3QJuLvBGw=
-github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
+github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
+github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a h1:eU8j/ClY2Ty3qdHnn0TyW3ivFoPC/0F1gQZz8yTxbbE=
+github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a/go.mod h1:v8eSC2SMp9/7FTKUncp7fH9IwPfw+ysMObcEz5FWheQ=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
@@ -51,12 +64,13 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.27.0 h1:1T7qCieN22GVc8S4Q2yuexzBb1EqjbgjSH9RohbMjKs=
-github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Qc0U=
+github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/zerolog v1.28.0 h1:MirSo27VyNi7RJYP3078AA1+Cyzd2GB66qy3aUHvsWY=
+github.com/rs/zerolog v1.28.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0=
 github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf h1:pvbZ0lM0XWPBqUKqFU8cmavspvIl9nulOYwdy6IFRRo=
 github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod h1:RJID2RhlZKId02nZ62WenDCkgHFerpIOmW0iT7GKmXM=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
@@ -68,27 +82,39 @@ github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
 github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
-github.com/yuin/goldmark v1.4.12 h1:6hffw6vALvEDqJ19dOJvJKOoAOKe4NDaTqvd2sktGN0=
-github.com/yuin/goldmark v1.4.12/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 gitlab.com/etke.cc/go/env v1.0.0 h1:J98BwzOuELnjsVPFvz5wa79L7IoRV9CmrS41xLYXtSw=
 gitlab.com/etke.cc/go/env v1.0.0/go.mod h1:e1l4RM5MA1sc0R1w/RBDAESWRwgo5cOG9gx8BKUn2C4=
 gitlab.com/etke.cc/go/logger v1.1.0 h1:Yngp/DDLmJ0jJNLvLXrfan5Gi5QV+r7z6kCczTv8t4U=
 gitlab.com/etke.cc/go/logger v1.1.0/go.mod h1:8Vw5HFXlZQ5XeqvUs5zan+GnhrQyYtm/xe+yj8H/0zk=
-gitlab.com/etke.cc/linkpearl v0.0.0-20220826133247-10dcaedb8085 h1:Qr6o2ERYCEkZAOhvIl4cwgUOHBn4sHq+yReCMjg8kvE=
-gitlab.com/etke.cc/linkpearl v0.0.0-20220826133247-10dcaedb8085/go.mod h1:CqwzwxVogKG6gDWTPTen3NyWbTESg42jxoTfXXwDGKQ=
-golang.org/x/crypto v0.0.0-20220824171710-5757bc0c5503 h1:vJ2V3lFLg+bBhgroYuRfyN583UzVveQmIXjc8T/y3to=
-golang.org/x/crypto v0.0.0-20220824171710-5757bc0c5503/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+gitlab.com/etke.cc/go/mxidwc v1.0.0 h1:6EAlJXvs3nU4RaMegYq6iFlyVvLw7JZYnZmNCGMYQP0=
+gitlab.com/etke.cc/go/mxidwc v1.0.0/go.mod h1:E/0kh45SAN9+ntTG0cwkAEKdaPxzvxVmnjwivm9nmz8=
+gitlab.com/etke.cc/go/secgen v1.1.1 h1:RmKOki725HIhWJHzPtAc9X4YvBneczndchpMgoDkE8w=
+gitlab.com/etke.cc/go/secgen v1.1.1/go.mod h1:3pJqRGeWApzx7qXjABqz2o2SMCNpKSZao/gXVdasqE8=
+gitlab.com/etke.cc/linkpearl v0.0.0-20220921080011-9407dc599571 h1:ool1wnAnnIhZjwPMd0LUebpfxqXZcVhRli2UDhay0bA=
+gitlab.com/etke.cc/linkpearl v0.0.0-20220921080011-9407dc599571/go.mod h1:4qbyfbuJSj89jFW7F+YjIbYrwJTrALQf4Otw0KGkIWE=
+golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0 h1:a5Yg6ylndHHYJqIPrdq0AhvR6KTvDTAvgBtaidhEevY=
+golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/net v0.0.0-20210501142056-aec3718b3fa0/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
-golang.org/x/net v0.0.0-20220822230855-b0a4917ee28c h1:JVAXQ10yGGVbSyoer5VILysz6YKjdNT2bsvlayjqhes=
-golang.org/x/net v0.0.0-20220822230855-b0a4917ee28c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20220920203100-d0c6ba3f52d9 h1:asZqf0wXastQr+DudYagQS8uBO8bHKeYD1vbAvGmFL8=
+golang.org/x/net v0.0.0-20220920203100-d0c6ba3f52d9/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64 h1:UiNENfZ8gDvpiWw7IpOMQ27spWmThO1RwwdQVbJahJM=
-golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
+golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
@@ -100,5 +126,5 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 maunium.net/go/maulogger/v2 v2.3.2 h1:1XmIYmMd3PoQfp9J+PaHhpt80zpfmMqaShzUTC7FwY0=
 maunium.net/go/maulogger/v2 v2.3.2/go.mod h1:TYWy7wKwz/tIXTpsx8G3mZseIRiC5DoMxSZazOHy68A=
-maunium.net/go/mautrix v0.12.0 h1:jyT1TkJBIRJ7+OW7NhmMHmnEEBLsQe9ml+FYwSLhlaU=
-maunium.net/go/mautrix v0.12.0/go.mod h1:hHvNi5iKVAiI2MAdAeXHtP4g9BvNEX2rsQpSF/x6Kx4=
+maunium.net/go/mautrix v0.12.1 h1:MLfkWkpRIgUn7lueDSlPwYOeIuGF+NrAHW0hInIuVAw=
+maunium.net/go/mautrix v0.12.1/go.mod h1:/jxQFIipObSsjZPH6o3xyUi8uoULz3Hfr/8p9loqpYE=
--- a/smtp/msa.go
+++ b/smtp/msa.go
@@ -0,0 +1,33 @@
+package smtp
+
+import (
+	"context"
+
+	"github.com/emersion/go-smtp"
+	"github.com/getsentry/sentry-go"
+	"gitlab.com/etke.cc/go/logger"
+)
+
+// msa is mail submission agent, implements smtp.Backend
+type msa struct {
+	log    *logger.Logger
+	domain string
+	bot    Bot
+}
+
+func (m *msa) newSession() *msasession {
+	return &msasession{
+		ctx:    sentry.SetHubOnContext(context.Background(), sentry.CurrentHub().Clone()),
+		log:    m.log,
+		bot:    m.bot,
+		domain: m.domain,
+	}
+}
+
+func (m *msa) Login(state *smtp.ConnectionState, username, password string) (smtp.Session, error) {
+	return nil, smtp.ErrAuthUnsupported
+}
+
+func (m *msa) AnonymousLogin(state *smtp.ConnectionState) (smtp.Session, error) {
+	return m.newSession(), nil
+}
--- a/smtp/msasession.go
+++ b/smtp/msasession.go
@@ -12,24 +12,24 @@ import (
 	"gitlab.com/etke.cc/postmoogle/utils"
 )

-type session struct {
+type msasession struct {
 	log    *logger.Logger
+	bot    Bot
 	domain string
-	client Client

 	ctx  context.Context
 	to   string
 	from string
 }

-func (s *session) Mail(from string, opts smtp.MailOptions) error {
+func (s *msasession) Mail(from string, opts smtp.MailOptions) error {
 	sentry.GetHubFromContext(s.ctx).Scope().SetTag("from", from)
 	s.from = from
 	s.log.Debug("mail from %s, options: %+v", from, opts)
 	return nil
 }

-func (s *session) Rcpt(to string) error {
+func (s *msasession) Rcpt(to string) error {
 	sentry.GetHubFromContext(s.ctx).Scope().SetTag("to", to)

 	if utils.Hostname(to) != s.domain {
@@ -37,7 +37,7 @@ func (s *session) Rcpt(to string) error {
 		return smtp.ErrAuthRequired
 	}

-	_, ok := s.client.GetMapping(utils.Mailbox(to))
+	_, ok := s.bot.GetMapping(utils.Mailbox(to))
 	if !ok {
 		s.log.Debug("mapping for %s not found", to)
 		return smtp.ErrAuthRequired
@@ -48,31 +48,27 @@ func (s *session) Rcpt(to string) error {
 	return nil
 }

-func (s *session) parseAttachments(parts []*enmime.Part) []*utils.File {
+func (s *msasession) parseAttachments(parts []*enmime.Part) []*utils.File {
 	files := make([]*utils.File, 0, len(parts))
 	for _, attachment := range parts {
 		for _, err := range attachment.Errors {
 			s.log.Warn("attachment error: %v", err)
 		}
-		file := utils.NewFile(attachment.FileName, attachment.ContentType, attachment.Content)
+		file := utils.NewFile(attachment.FileName, attachment.Content)
 		files = append(files, file)
 	}

 	return files
 }

-func (s *session) Data(r io.Reader) error {
+func (s *msasession) Data(r io.Reader) error {
 	parser := enmime.NewParser()
 	eml, err := parser.ReadEnvelope(r)
 	if err != nil {
 		return err
 	}

-	attachments := s.parseAttachments(eml.Attachments)
-	inlines := s.parseAttachments(eml.Inlines)
-	files := make([]*utils.File, 0, len(attachments)+len(inlines))
-	files = append(files, attachments...)
-	files = append(files, inlines...)
+	files := s.parseAttachments(eml.Attachments)

 	email := utils.NewEmail(
 		eml.GetHeader("Message-Id"),
@@ -84,11 +80,11 @@ func (s *session) Data(r io.Reader) error {
 		eml.HTML,
 		files)

-	return s.client.Send(s.ctx, email)
+	return s.bot.Send2Matrix(s.ctx, email)
 }

-func (s *session) Reset() {}
+func (s *msasession) Reset() {}

-func (s *session) Logout() error {
+func (s *msasession) Logout() error {
 	return nil
 }
--- a/smtp/mta.go
+++ b/smtp/mta.go
@@ -0,0 +1,132 @@
+package smtp
+
+import (
+	"context"
+	"crypto/tls"
+	"fmt"
+	"io"
+	"net"
+	"net/smtp"
+	"strings"
+
+	"gitlab.com/etke.cc/go/logger"
+	"maunium.net/go/mautrix/id"
+
+	"gitlab.com/etke.cc/postmoogle/utils"
+)
+
+// Bot interface to send emails into matrix
+type Bot interface {
+	GetMapping(string) (id.RoomID, bool)
+	Send2Matrix(ctx context.Context, email *utils.Email) error
+	SetMTA(mta utils.MTA)
+}
+
+// mta is Mail Transfer Agent
+type mta struct {
+	log *logger.Logger
+}
+
+// SMTPAddrs priority list
+var SMTPAddrs = []string{":25", ":587", ":465"}
+
+func NewMTA(loglevel string) utils.MTA {
+	return &mta{
+		log: logger.New("smtp/mta.", loglevel),
+	}
+}
+
+func (m *mta) Send(from, to, data string) error {
+	m.log.Debug("Sending email from %s to %s", from, to)
+	conn, err := m.connect(from, to)
+	if err != nil {
+		m.log.Error("cannot connect to SMTP server of %s: %v", to, err)
+		return err
+	}
+	defer conn.Close()
+	err = conn.Mail(from)
+	if err != nil {
+		m.log.Error("cannot call MAIL command: %v", err)
+		return err
+	}
+	err = conn.Rcpt(to)
+	if err != nil {
+		m.log.Error("cannot send RCPT command: %v", err)
+		return err
+	}
+
+	var w io.WriteCloser
+	w, err = conn.Data()
+	if err != nil {
+		m.log.Error("cannot send DATA command: %v", err)
+		return err
+	}
+	defer w.Close()
+	m.log.Debug("sending DATA:\n%s", data)
+	_, err = strings.NewReader(data).WriteTo(w)
+	if err != nil {
+		m.log.Debug("cannot write DATA: %v", err)
+		return err
+	}
+
+	m.log.Debug("email has been sent")
+	return nil
+}
+
+func (m *mta) tryServer(localname, mxhost, addr string) *smtp.Client {
+	m.log.Debug("trying SMTP connection to %s%s", mxhost, addr)
+	conn, err := smtp.Dial(mxhost + addr)
+	if err != nil {
+		m.log.Warn("cannot connect to the %s%s: %v", mxhost, addr, err)
+		return nil
+	}
+	err = conn.Hello(localname)
+	if err != nil {
+		m.log.Warn("cannot call HELLO command of the %s%s: %v", mxhost, addr, err)
+		return nil
+	}
+	if ok, _ := conn.Extension("STARTTLS"); ok {
+		m.log.Debug("%s supports STARTTLS", mxhost)
+		config := &tls.Config{ServerName: mxhost}
+		err = conn.StartTLS(config)
+		if err != nil {
+			m.log.Warn("STARTTLS connection to the %s failed: %v", mxhost, err)
+		}
+	}
+
+	return conn
+}
+
+func (m *mta) connect(from, to string) (*smtp.Client, error) {
+	localname := strings.SplitN(from, "@", 2)[1]
+	hostname := strings.SplitN(to, "@", 2)[1]
+
+	m.log.Debug("performing MX lookup of %s", hostname)
+	mxs, err := net.LookupMX(hostname)
+	if err != nil {
+		m.log.Error("cannot perform MX lookup: %v", err)
+		return nil, err
+	}
+
+	for _, mx := range mxs {
+		for _, addr := range SMTPAddrs {
+			client := m.tryServer(localname, strings.TrimSuffix(mx.Host, "."), addr)
+			if client != nil {
+				return client, nil
+			}
+		}
+	}
+
+	// If there are no MX records, according to https://datatracker.ietf.org/doc/html/rfc5321#section-5.1,
+	// we're supposed to try talking directly to the host.
+	if len(mxs) == 0 {
+		for _, addr := range SMTPAddrs {
+			client := m.tryServer(localname, hostname, addr)
+			if client != nil {
+				return client, nil
+			}
+		}
+	}
+
+	return nil, fmt.Errorf("target SMTP server not found")
+}
--- a/smtp/server.go
+++ b/smtp/server.go
@@ -1,56 +1,125 @@
 package smtp

 import (
-	"context"
+	"crypto/tls"
+	"net"
 	"os"
 	"time"

 	"github.com/emersion/go-smtp"
-	"github.com/getsentry/sentry-go"
 	"gitlab.com/etke.cc/go/logger"
 )

-type backend struct {
-	log    *logger.Logger
-	domain string
-	client Client
+type Config struct {
+	Domain string
+	Port   string
+
+	TLSCert     string
+	TLSKey      string
+	TLSPort     string
+	TLSRequired bool
+
+	LogLevel string
+	MaxSize  int
+	Bot      Bot
 }

-func (b *backend) newSession() *session {
-	return &session{
-		ctx:    sentry.SetHubOnContext(context.Background(), sentry.CurrentHub().Clone()),
-		log:    b.log,
-		domain: b.domain,
-		client: b.client,
-	}
+type Server struct {
+	log  *logger.Logger
+	msa  *smtp.Server
+	errs chan error
+
+	port    string
+	tlsPort string
+	tlsCfg  *tls.Config
 }

-func (b *backend) Login(state *smtp.ConnectionState, username, password string) (smtp.Session, error) {
-	return nil, smtp.ErrAuthUnsupported
-}
-
-func (b *backend) AnonymousLogin(state *smtp.ConnectionState) (smtp.Session, error) {
-	return b.newSession(), nil
-}
-
-func Start(domain, port, loglevel string, maxSize int, client Client) error {
-	log := logger.New("smtp.", loglevel)
-	be := &backend{
+// NewServer creates new SMTP server
+func NewServer(cfg *Config) *Server {
+	log := logger.New("smtp/msa.", cfg.LogLevel)
+	sender := NewMTA(cfg.LogLevel)
+	receiver := &msa{
 		log:    log,
-		domain: domain,
-		client: client,
+		bot:    cfg.Bot,
+		domain: cfg.Domain,
 	}
-	s := smtp.NewServer(be)
-	s.Addr = ":" + port
-	s.Domain = domain
-	s.AuthDisabled = true
+	receiver.bot.SetMTA(sender)
+
+	s := smtp.NewServer(receiver)
+	s.Domain = cfg.Domain
 	s.ReadTimeout = 10 * time.Second
 	s.WriteTimeout = 10 * time.Second
-	s.MaxMessageBytes = maxSize * 1024 * 1024
+	s.MaxMessageBytes = cfg.MaxSize * 1024 * 1024
+	s.EnableREQUIRETLS = cfg.TLSRequired
 	if log.GetLevel() == "DEBUG" || log.GetLevel() == "TRACE" {
 		s.Debug = os.Stdout
 	}

-	log.Info("Starting SMTP server on %s:%s", domain, port)
-	return s.ListenAndServe()
+	server := &Server{
+		msa:     s,
+		log:     log,
+		port:    cfg.Port,
+		tlsPort: cfg.TLSPort,
+	}
+	server.loadTLSConfig(cfg.TLSCert, cfg.TLSKey)
+	return server
+}
+
+// Start SMTP server
+func (s *Server) Start() error {
+	s.errs = make(chan error, 1)
+	go s.listen(s.port, nil)
+	if s.tlsCfg != nil {
+		go s.listen(s.tlsPort, s.tlsCfg)
+	}
+
+	return <-s.errs
+}
+
+// Stop SMTP server
+func (s *Server) Stop() {
+	err := s.msa.Close()
+	if err != nil {
+		s.log.Error("cannot stop SMTP server properly: %v", err)
+	}
+	s.log.Info("SMTP server has been stopped")
+}
+
+func (s *Server) listen(port string, tlsCfg *tls.Config) {
+	var l net.Listener
+	var err error
+	if tlsCfg != nil {
+		l, err = tls.Listen("tcp", ":"+port, tlsCfg)
+	} else {
+		l, err = net.Listen("tcp", ":"+port)
+	}
+	if err != nil {
+		s.log.Error("cannot start listener on %s: %v", port, err)
+		s.errs <- err
+		return
+	}
+
+	s.log.Info("Starting SMTP server on port %s", port)
+
+	err = s.msa.Serve(l)
+	if err != nil {
+		s.log.Error("cannot start SMTP server on %s: %v", port, err)
+		s.errs <- err
+		close(s.errs)
+	}
+}
+
+func (s *Server) loadTLSConfig(cert, key string) {
+	if cert == "" || key == "" {
+		s.log.Warn("SSL certificate is not provided")
+		return
+	}
+
+	tlsCert, err := tls.LoadX509KeyPair(cert, key)
+	if err != nil {
+		s.log.Error("cannot load SSL certificate: %v", err)
+		return
+	}
+	s.tlsCfg = &tls.Config{Certificates: []tls.Certificate{tlsCert}}
+	s.msa.TLSConfig = s.tlsCfg
 }
--- a/smtp/smtp.go
+++ b/smtp/smtp.go
@@ -1,15 +0,0 @@
-package smtp
-
-import (
-	"context"
-
-	"maunium.net/go/mautrix/id"
-
-	"gitlab.com/etke.cc/postmoogle/utils"
-)
-
-// Client interface to send emails
-type Client interface {
-	GetMapping(string) (id.RoomID, bool)
-	Send(ctx context.Context, email *utils.Email) error
-}
--- a/utils/command.go
+++ b/utils/command.go
@@ -0,0 +1,25 @@
+package utils
+
+import (
+	"fmt"
+	"strings"
+)
+
+// ErrInvalidArgs returned when a command's arguments are invalid
+var ErrInvalidArgs = fmt.Errorf("invalid arguments")
+
+// ParseSend parses "!pm send" command, returns to, subject, body, err
+func ParseSend(commandSlice []string) (string, string, string, error) {
+	if len(commandSlice) < 3 {
+		return "", "", "", ErrInvalidArgs
+	}
+
+	message := strings.Join(commandSlice, " ")
+	lines := strings.Split(message, "\n")
+	commandSlice = strings.Split(lines[0], " ")
+	to := commandSlice[1]
+	subject := lines[1]
+	body := strings.Join(lines[2:], "\n")
+
+	return to, subject, body, nil
+}
--- a/utils/email.go
+++ b/utils/email.go
@@ -1,7 +1,26 @@
 package utils

+import (
+	"crypto"
+	"crypto/x509"
+	"encoding/pem"
+	"strings"
+	"time"
+
+	"github.com/emersion/go-msgauth/dkim"
+	"maunium.net/go/mautrix/event"
+	"maunium.net/go/mautrix/format"
+	"maunium.net/go/mautrix/id"
+)
+
+// MTA is mail transfer agent
+type MTA interface {
+	Send(from, to, data string) error
+}
+
 // Email object
 type Email struct {
+	Date      string
 	MessageID string
 	InReplyTo string
 	From      string
@@ -12,9 +31,25 @@ type Email struct {
 	Files     []*File
 }

+// ContentOptions represents settings that specify how an email is to be converted to a Matrix message
+type ContentOptions struct {
+	// On/Off
+	Sender  bool
+	Subject bool
+	HTML    bool
+	Threads bool
+
+	// Keys
+	MessageIDKey string
+	InReplyToKey string
+	SubjectKey   string
+	FromKey      string
+}
+
 // NewEmail constructs Email object
 func NewEmail(messageID, inReplyTo, subject, from, to, text, html string, files []*File) *Email {
 	email := &Email{
+		Date:      time.Now().UTC().Format(time.RFC1123Z),
 		MessageID: messageID,
 		InReplyTo: inReplyTo,
 		From:      from,
@@ -35,3 +70,105 @@ func NewEmail(messageID, inReplyTo, subject, from, to, text, html string, files

 	return email
 }
+
+// Content converts the email object to a Matrix event content
+func (e *Email) Content(threadID id.EventID, options *ContentOptions) *event.Content {
+	var text strings.Builder
+	if options.Sender {
+		text.WriteString("From: ")
+		text.WriteString(e.From)
+		text.WriteString("\n\n")
+	}
+	if options.Subject {
+		text.WriteString("# ")
+		text.WriteString(e.Subject)
+		text.WriteString("\n\n")
+	}
+	if e.HTML != "" && options.HTML {
+		text.WriteString(format.HTMLToMarkdown(e.HTML))
+	} else {
+		text.WriteString(e.Text)
+	}
+
+	parsed := format.RenderMarkdown(text.String(), true, true)
+	parsed.RelatesTo = RelatesTo(options.Threads, threadID)
+
+	content := event.Content{
+		Raw: map[string]interface{}{
+			options.MessageIDKey: e.MessageID,
+			options.InReplyToKey: e.InReplyTo,
+			options.SubjectKey:   e.Subject,
+			options.FromKey:      e.From,
+		},
+		Parsed: parsed,
+	}
+	return &content
+}
+
+// Compose converts the email object to a string (to be used for delivery via SMTP) and possibly DKIM-signs it
+func (e *Email) Compose(privkey string) string {
+	var data strings.Builder
+
+	domain := strings.SplitN(e.From, "@", 2)[1]
+	data.WriteString("From: ")
+	data.WriteString(e.From)
+	data.WriteString("\r\n")
+
+	data.WriteString("To: ")
+	data.WriteString(e.To)
+	data.WriteString("\r\n")
+
+	data.WriteString("Message-Id: ")
+	data.WriteString(e.MessageID)
+	data.WriteString("\r\n")
+
+	data.WriteString("Date: ")
+	data.WriteString(e.Date)
+	data.WriteString("\r\n")
+
+	if e.InReplyTo != "" {
+		data.WriteString("In-Reply-To: ")
+		data.WriteString(e.InReplyTo)
+		data.WriteString("\r\n")
+	}
+
+	data.WriteString("Subject: ")
+	data.WriteString(e.Subject)
+	data.WriteString("\r\n")
+
+	data.WriteString("\r\n")
+
+	data.WriteString(e.Text)
+	data.WriteString("\r\n")
+
+	return e.sign(domain, privkey, data)
+}
+
+func (e *Email) sign(domain, privkey string, data strings.Builder) string {
+	if privkey == "" {
+		return data.String()
+	}
+	pemblock, _ := pem.Decode([]byte(privkey))
+	if pemblock == nil {
+		return data.String()
+	}
+	parsedkey, err := x509.ParsePKCS8PrivateKey(pemblock.Bytes)
+	if err != nil {
+		return data.String()
+	}
+	signer := parsedkey.(crypto.Signer)
+
+	options := &dkim.SignOptions{
+		Domain:   domain,
+		Selector: "postmoogle",
+		Signer:   signer,
+	}
+
+	var msg strings.Builder
+	err = dkim.Sign(&msg, strings.NewReader(data.String()), options)
+	if err != nil {
+		return data.String()
+	}
+
+	return msg.String()
+}
--- a/utils/file.go
+++ b/utils/file.go
@@ -2,25 +2,32 @@ package utils

 import (
 	"bytes"
+	"strings"

+	"github.com/gabriel-vasile/mimetype"
 	"maunium.net/go/mautrix"
+	"maunium.net/go/mautrix/event"
 )

 type File struct {
 	Name    string
 	Type    string
+	MsgType event.MessageType
 	Length  int
 	Content []byte
 }

-func NewFile(name, contentType string, content []byte) *File {
+func NewFile(name string, content []byte) *File {
 	file := &File{
 		Name:    name,
-		Type:    contentType,
 		Content: content,
 	}
 	file.Length = len(content)

+	mtype := mimetype.Detect(content)
+	file.Type = mtype.String()
+	file.MsgType = mimeMsgType(file.Type)
+
 	return file
 }

@@ -33,3 +40,23 @@ func (f *File) Convert() mautrix.ReqUploadMedia {
 		FileName:      f.Name,
 	}
 }
+
+func mimeMsgType(mime string) event.MessageType {
+	if mime == "" {
+		return event.MsgFile
+	}
+	if !strings.Contains(mime, "/") {
+		return event.MsgFile
+	}
+	msection := strings.Split(mime, "/")[0]
+	switch msection {
+	case "image":
+		return event.MsgImage
+	case "video":
+		return event.MsgVideo
+	case "audio":
+		return event.MsgAudio
+	default:
+		return event.MsgFile
+	}
+}
--- a/utils/matrix.go
+++ b/utils/matrix.go
@@ -6,26 +6,65 @@ import (
 	"maunium.net/go/mautrix/id"
 )

-// RelatesTo block of matrix event content
-func RelatesTo(noThreads bool, parentID id.EventID) *event.RelatesTo {
+// RelatesTo returns relation object of a matrix event (either threads or reply-to)
+func RelatesTo(threads bool, parentID id.EventID) *event.RelatesTo {
 	if parentID == "" {
 		return nil
 	}

-	if noThreads {
+	if threads {
 		return &event.RelatesTo{
-			InReplyTo: &event.InReplyTo{
-				EventID: parentID,
-			},
+			Type:    event.RelThread,
+			EventID: parentID,
 		}
 	}

 	return &event.RelatesTo{
-		Type:    event.RelThread,
-		EventID: parentID,
+		InReplyTo: &event.InReplyTo{
+			EventID: parentID,
+		},
 	}
 }

+// EventParent returns parent event ID (either from thread or from reply-to relation)
+func EventParent(currentID id.EventID, content *event.MessageEventContent) id.EventID {
+	if content == nil {
+		return currentID
+	}
+
+	if content.GetRelatesTo() == nil {
+		return currentID
+	}
+
+	threadParent := content.RelatesTo.GetThreadParent()
+	if threadParent != "" {
+		return threadParent
+	}
+
+	replyParent := content.RelatesTo.GetReplyTo()
+	if replyParent != "" {
+		return replyParent
+	}
+
+	return currentID
+}
+
+// EventField returns field value from raw event content
+func EventField[T comparable](content *event.Content, field string) T {
+	var zero T
+	raw := content.Raw[field]
+	if raw == nil {
+		return zero
+	}
+
+	v, ok := raw.(T)
+	if !ok {
+		return zero
+	}
+
+	return v
+}
+
 // UnwrapError tries to unwrap a error into something meaningful, like mautrix.HTTPError or mautrix.RespError
 func UnwrapError(err error) error {
 	switch err.(type) {
--- a/utils/user.go
+++ b/utils/user.go
@@ -1,104 +0,0 @@
-package utils
-
-import (
-	"fmt"
-	"regexp"
-	"strings"
-)
-
-// WildcardMXIDsToRegexes converts a list of wildcard patterns to a list of regular expressions
-func WildcardMXIDsToRegexes(wildCardPatterns []string) ([]*regexp.Regexp, error) {
-	regexPatterns := make([]*regexp.Regexp, len(wildCardPatterns))
-
-	for idx, wildCardPattern := range wildCardPatterns {
-		regex, err := parseMXIDWildcard(wildCardPattern)
-		if err != nil {
-			return nil, fmt.Errorf("failed to parse allowed user rule `%s`: %s", wildCardPattern, err)
-		}
-		regexPatterns[idx] = regex
-	}
-
-	return regexPatterns, nil
-}
-
-// Match tells if the given user id is allowed to use the bot, according to the given whitelist
-func Match(userID string, allowed []*regexp.Regexp) bool {
-	for _, regex := range allowed {
-		if regex.MatchString(userID) {
-			return true
-		}
-	}
-
-	return false
-}
-
-// parseMXIDWildcard parses a user whitelisting wildcard rule and returns a regular expression which corresponds to it
-//
-// Example conversion: `@bot.*.something:*.example.com` -> `^bot\.([^:@]*)\.something:([^:@]*)\.example.com$`
-// Example of recognized wildcard patterns: `@someone:example.com`, `@*:example.com`, `@bot.*:example.com`, `@someone:*`, `@someone:*.example.com`
-//
-// The `*` wildcard character is normally interpretted as "a number of literal characters or an empty string".
-// Our implementation below matches this (yielding `([^:@])*`), which could provide a slightly suboptimal regex in these cases:
-// - `@*:example.com` -> `^@([^:@])*:example\.com$`, although `^@([^:@])+:example\.com$` would be preferable
-// - `@someone:*` -> `@someone:([^:@])*$`, although `@someone:([^:@])+$` would be preferable
-// When it's a bare wildcard (`*`, instead of `*.example.com`) we likely prefer to yield a regex that matches **at least one character**.
-// This probably doesn't matter because mxids that we'll match against are all valid and fully complete.
-func parseMXIDWildcard(wildCardRule string) (*regexp.Regexp, error) {
-	if !strings.HasPrefix(wildCardRule, "@") {
-		return nil, fmt.Errorf("rules need to be fully-qualified, starting with a @")
-	}
-
-	remainingRule := wildCardRule[1:]
-	if strings.Contains(remainingRule, "@") {
-		return nil, fmt.Errorf("rules cannot contain more than one @")
-	}
-
-	parts := strings.Split(remainingRule, ":")
-	if len(parts) != 2 {
-		return nil, fmt.Errorf("expected exactly 2 parts in the rule, separated by `:`")
-	}
-
-	localPart := parts[0]
-	localPartPattern, err := getRegexPatternForPart(localPart)
-	if err != nil {
-		return nil, fmt.Errorf("failed to convert local part `%s` to regex: %s", localPart, err)
-	}
-
-	domainPart := parts[1]
-	domainPartPattern, err := getRegexPatternForPart(domainPart)
-	if err != nil {
-		return nil, fmt.Errorf("failed to convert domain part `%s` to regex: %s", domainPart, err)
-	}
-
-	finalPattern := fmt.Sprintf("^@%s:%s$", localPartPattern, domainPartPattern)
-
-	regex, err := regexp.Compile(finalPattern)
-	if err != nil {
-		return nil, fmt.Errorf("failed to compile regex `%s`: %s", finalPattern, err)
-	}
-
-	return regex, nil
-}
-
-func getRegexPatternForPart(part string) (string, error) {
-	if part == "" {
-		return "", fmt.Errorf("rejecting empty part")
-	}
-
-	var pattern strings.Builder
-	for _, rune := range part {
-		if rune == '*' {
-			// We match everything except for `:` and `@`, because that would be an invalid MXID anyway.
-			//
-			// If the whole part is `*` (only) instead of merely containing `*` within it,
-			// we may also consider replacing it with `([^:@]+)` (+, instead of *).
-			// See parseMXIDWildcard for notes about this.
-			pattern.WriteString("([^:@]*)")
-			continue
-		}
-
-		pattern.WriteString(regexp.QuoteMeta(string(rune)))
-	}
-
-	return pattern.String(), nil
-}
--- a/utils/user_test.go
+++ b/utils/user_test.go
@@ -1,221 +0,0 @@
-package utils
-
-import "testing"
-
-func TestRuleToRegex(t *testing.T) {
-	type testDataDefinition struct {
-		name           string
-		checkedValue   string
-		expectedResult string
-		expectedError  bool
-	}
-
-	tests := []testDataDefinition{
-		{
-			name:           "simple pattern without wildcards succeeds",
-			checkedValue:   "@someone:example.com",
-			expectedResult: `^@someone:example\.com$`,
-			expectedError:  false,
-		},
-		{
-			name:           "pattern with wildcard as the whole local part succeeds",
-			checkedValue:   "@*:example.com",
-			expectedResult: `^@([^:@]*):example\.com$`,
-			expectedError:  false,
-		},
-		{
-			name:           "pattern with wildcard within the local part succeeds",
-			checkedValue:   "@bot.*.something:example.com",
-			expectedResult: `^@bot\.([^:@]*)\.something:example\.com$`,
-			expectedError:  false,
-		},
-		{
-			name:           "pattern with wildcard as the whole domain part succeeds",
-			checkedValue:   "@someone:*",
-			expectedResult: `^@someone:([^:@]*)$`,
-			expectedError:  false,
-		},
-		{
-			name:           "pattern with wildcard within the domain part succeeds",
-			checkedValue:   "@someone:*.organization.com",
-			expectedResult: `^@someone:([^:@]*)\.organization\.com$`,
-			expectedError:  false,
-		},
-		{
-			name:           "pattern with wildcard in both parts succeeds",
-			checkedValue:   "@*:*",
-			expectedResult: `^@([^:@]*):([^:@]*)$`,
-			expectedError:  false,
-		},
-		{
-			name:           "pattern that does not appear fully-qualified fails",
-			checkedValue:   "someone:example.com",
-			expectedResult: ``,
-			expectedError:  true,
-		},
-		{
-			name:           "pattern that does not appear fully-qualified fails",
-			checkedValue:   "@someone",
-			expectedResult: ``,
-			expectedError:  true,
-		},
-		{
-			name:           "pattern with empty domain part fails",
-			checkedValue:   "@someone:",
-			expectedResult: ``,
-			expectedError:  true,
-		},
-		{
-			name:           "pattern with empty local part fails",
-			checkedValue:   "@:example.com",
-			expectedResult: ``,
-			expectedError:  true,
-		},
-		{
-			name:           "pattern with multiple @ fails",
-			checkedValue:   "@someone@someone:example.com",
-			expectedResult: ``,
-			expectedError:  true,
-		},
-		{
-			name:           "pattern with multiple : fails",
-			checkedValue:   "@someone:someone:example.com",
-			expectedResult: ``,
-			expectedError:  true,
-		},
-	}
-
-	for _, testData := range tests {
-		func(testData testDataDefinition) {
-			t.Run(testData.name, func(t *testing.T) {
-				actualResult, err := parseMXIDWildcard(testData.checkedValue)
-
-				if testData.expectedError {
-					if err != nil {
-						return
-					}
-
-					t.Errorf("expected an error, but did not get one")
-				}
-
-				if err != nil {
-					t.Errorf("did not expect an error, but got one: %s", err)
-				}
-
-				if actualResult.String() == testData.expectedResult {
-					return
-				}
-
-				t.Errorf(
-					"Expected `%s` to yield `%s`, not `%s`",
-					testData.checkedValue,
-					testData.expectedResult,
-					actualResult.String(),
-				)
-			})
-		}(testData)
-	}
-}
-
-func TestMatch(t *testing.T) {
-	type testDataDefinition struct {
-		name           string
-		checkedValue   string
-		allowedUsers   []string
-		expectedResult bool
-	}
-
-	tests := []testDataDefinition{
-		{
-			name:           "Empty allowed users allows no one",
-			checkedValue:   "@someone:example.com",
-			allowedUsers:   []string{},
-			expectedResult: false,
-		},
-		{
-			name:           "Direct full mxid match is allowed",
-			checkedValue:   "@someone:example.com",
-			allowedUsers:   []string{"@someone:example.com"},
-			expectedResult: true,
-		},
-		{
-			name:           "Direct full mxid match later on is allowed",
-			checkedValue:   "@someone:example.com",
-			allowedUsers:   []string{"@another:example.com", "@someone:example.com"},
-			expectedResult: true,
-		},
-		{
-			name:           "No mxid match is not allowed",
-			checkedValue:   "@someone:example.com",
-			allowedUsers:   []string{"@another:example.com"},
-			expectedResult: false,
-		},
-		{
-			name:           "mxid localpart only wildcard match is allowed",
-			checkedValue:   "@someone:example.com",
-			allowedUsers:   []string{"@*:example.com"},
-			expectedResult: true,
-		},
-		{
-			name:           "mxid localpart with wildcard match is allowed",
-			checkedValue:   "@bot.abc:example.com",
-			allowedUsers:   []string{"@bot.*:example.com"},
-			expectedResult: true,
-		},
-		{
-			name:           "mxid localpart with wildcard match is not allowed when it does not match",
-			checkedValue:   "@bot.abc:example.com",
-			allowedUsers:   []string{"@employee.*:example.com"},
-			expectedResult: false,
-		},
-		{
-			name:           "mxid localpart wildcard for another domain is not allowed",
-			checkedValue:   "@someone:example.com",
-			allowedUsers:   []string{"@*:another.com"},
-			expectedResult: false,
-		},
-		{
-			name:           "mxid domainpart with only wildcard match is allowed",
-			checkedValue:   "@someone:example.com",
-			allowedUsers:   []string{"@someone:*"},
-			expectedResult: true,
-		},
-		{
-			name:           "mxid domainpart with wildcard match is allowed",
-			checkedValue:   "@someone:example.organization.com",
-			allowedUsers:   []string{"@someone:*.organization.com"},
-			expectedResult: true,
-		},
-		{
-			name:           "mxid domainpart with wildcard match is not allowed when it does not match",
-			checkedValue:   "@someone:example.another.com",
-			allowedUsers:   []string{"@someone:*.organization.com"},
-			expectedResult: false,
-		},
-	}
-
-	for _, testData := range tests {
-		func(testData testDataDefinition) {
-			t.Run(testData.name, func(t *testing.T) {
-				allowedUserRegexes, err := WildcardMXIDsToRegexes(testData.allowedUsers)
-				if err != nil {
-					t.Error(err)
-				}
-
-				actualResult := Match(testData.checkedValue, allowedUserRegexes)
-
-				if actualResult == testData.expectedResult {
-					return
-				}
-
-				t.Errorf(
-					"Expected `%s` compared against `%v` to yield `%v`, not `%v`",
-					testData.checkedValue,
-					testData.allowedUsers,
-					testData.expectedResult,
-					actualResult,
-				)
-			})
-		}(testData)
-	}
-}
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -11,7 +11,7 @@ func Mailbox(email string) string {
 	if index == -1 {
 		return email
 	}
-	return email[:strings.LastIndex(email, "@")]
+	return email[:index]
 }

 // Hostname returns hostname part from email address
Author	SHA1	Message	Date
Aine	c9c871287d	add read receipts and typing notifications, closes #30	2022-09-21 11:18:25 +03:00
Aine	16c577eeb2	update deps	2022-09-21 11:10:41 +03:00
Aine	97aacbf143	export MXID patterns parsing to external lib	2022-09-14 13:46:56 +03:00
Aine	14c0ebf1f1	fix attachments msg type parser	2022-09-13 18:35:19 +03:00
Aine	af3e23f630	enable starttls, fixes #29	2022-09-13 18:28:36 +03:00
Aine	691bf31dff	fix access denied on !pm send	2022-09-13 17:29:49 +03:00
Aine	76bffd931c	correctly handle attachments mimetype and set proper msgtype, fixes #27	2022-09-13 17:21:00 +03:00
Aine	7e92c023c8	do not parse inlines, fixes #28	2022-09-13 16:57:17 +03:00
Slavi Pantaleev	a73735d849	Merge branch 'listentls' into 'main' Secure SMTP listener See merge request etke.cc/postmoogle!31	2022-09-08 14:30:47 +00:00
Aine	08aa23b397	fix Message-Id, fixes #20	2022-09-08 14:08:17 +03:00
Aine	613767a86d	update POSTMOOGLE_TLS_REQUIRED comment	2022-09-08 11:49:59 +03:00
Aine	eb88b74ff7	remove close() on error	2022-09-08 11:44:49 +03:00
Aine	9a121b6ed5	try to send emails over TLS first	2022-09-08 09:52:58 +03:00
Slavi Pantaleev	d434edd930	Merge branch 'dkimreset' into 'main' !pm dkim reset; switch DKIM algo to RSA See merge request etke.cc/postmoogle!32	2022-09-08 06:48:52 +00:00
Aine	daeb72aa58	add TL;DR DNS config	2022-09-08 09:36:33 +03:00
Aine	a608fffea8	!pm dkim reset; switch DKIM algo to RSA	2022-09-08 09:31:09 +03:00
Aine	31a1399736	fix dkim signature (domain), fixes #21	2022-09-08 00:11:10 +03:00
Aine	40f2ec9492	fix command parsing	2022-09-07 23:51:37 +03:00
Aine	59ed33638b	Secure SMTP listener	2022-09-07 21:29:52 +03:00
Aine	715ec1ef2a	fix #19	2022-09-07 20:24:49 +03:00
Slavi Pantaleev	47767e2ab2	Merge branch 'send' into 'main' send emails See merge request etke.cc/postmoogle!30	2022-09-07 06:47:41 +00:00
Slavi Pantaleev	8823867ba5	Apply 1 suggestion(s) to 1 file(s)	2022-09-06 19:55:46 +00:00
Slavi Pantaleev	c4e136674a	Apply 1 suggestion(s) to 1 file(s)	2022-09-06 19:55:38 +00:00
Slavi Pantaleev	d4b6c7bd1f	Apply 1 suggestion(s) to 1 file(s)	2022-09-06 19:55:27 +00:00
Aine	d5676ecc07	replace DOMAIN to example.com in readme	2022-09-06 22:55:08 +03:00
Slavi Pantaleev	eacdbe587b	Apply 1 suggestion(s) to 1 file(s)	2022-09-06 19:53:00 +00:00
Aine	78210e6487	update utils.RelatesTo and utils.EventParent comments	2022-09-06 22:52:40 +03:00
Slavi Pantaleev	ca758f8825	Apply 1 suggestion(s) to 1 file(s)	2022-09-06 19:49:30 +00:00
Slavi Pantaleev	321d1da79f	Apply 1 suggestion(s) to 1 file(s)	2022-09-06 19:49:13 +00:00
Slavi Pantaleev	bac3447db2	Apply 1 suggestion(s) to 1 file(s)	2022-09-06 19:49:02 +00:00
Aine	86890c1f89	refactor email.Compose()	2022-09-06 22:48:37 +03:00
Slavi Pantaleev	4c96e6a11f	Apply 1 suggestion(s) to 1 file(s)	2022-09-06 19:44:05 +00:00
Aine	4d01579505	move email sending to b.runSend()	2022-09-06 22:43:04 +03:00
Aine	db135c0cb1	deconstruct getSubject and getBody	2022-09-06 22:34:21 +03:00
Aine	bbb6bec35f	update SetMTA comment	2022-09-06 22:21:23 +03:00
Aine	5945ddc8a0	rename internal thigs of smtp/	2022-09-06 22:16:28 +03:00
Aine	2b5095b0b2	add note about interface	2022-09-06 22:03:10 +03:00
Aine	af1b664274	cache empty settings	2022-09-06 22:02:21 +03:00
Aine	17c8d06a33	disable insecure auth	2022-09-06 18:51:46 +03:00
Aine	085cdf5dbf	refactor email2content	2022-09-06 18:39:35 +03:00
Aine	1f896d1b26	add note about MX record	2022-09-06 16:46:14 +03:00
Aine	7d435f7ba8	move email composing to utils	2022-09-05 20:38:58 +03:00
Aine	2427d41ae3	move parsing of !pm send to utils, update !pm send instructions	2022-09-05 20:10:07 +03:00
Aine	e4c425fb2e	update readme	2022-09-05 18:00:09 +03:00
Aine	41f3ad947e	fix readme	2022-09-05 17:02:45 +03:00
Aine	12a2d4c6f9	dkim	2022-09-05 17:02:00 +03:00
Aine	fda0d62087	send emails	2022-09-04 22:09:53 +03:00
Aine	a92b4c64ae	Merge branch 'only-follow-invites-for-allowed' into 'main' Only auto-join rooms when invited by allowed users Closes #17 See merge request etke.cc/postmoogle!28	2022-08-31 12:59:04 +00:00
Slavi Pantaleev	61cc9b21c5	Only auto-join rooms when invited by allowed users Previously, anyone (even across federation) could invite you to a room and the bot would join. It may not have provided a useful purpose, but it still joined all rooms it was invited to. We now only join rooms when we're invited by a person who is actually allowed to use the bot. Fixes https://gitlab.com/etke.cc/postmoogle/-/issues/17	2022-08-31 15:54:56 +03:00
Aine	a3c81ab232	Merge branch 'better-introduction' into 'main' Improve introduction and getters usability See merge request etke.cc/postmoogle!26	2022-08-31 07:40:25 +00:00
Aine	ab95fe5d2d	refactor to fmt.Sprintf()	2022-08-31 10:39:30 +03:00
Aine	104e948b9c	remove migrations	2022-08-31 10:33:13 +03:00
Aine	67f504f888	Merge branch 'fix-double-domain-again' into 'main' Do not append domain twice when updating mailbox (again) See merge request etke.cc/postmoogle!27	2022-08-31 07:24:40 +00:00
Aine	bf970fc699	remove duplications in utils.Mailbox	2022-08-31 10:24:17 +03:00
Slavi Pantaleev	4b1ce195b4	Do not append domain twice when updating mailbox (again) Fixes: > `mailbox` of this room set to `test@domain@domain` Previously fixed in `97a4d6c7bc`, but it seems like we unintentionally reintroduced this bug again at some point after that.	2022-08-31 09:16:16 +03:00
Slavi Pantaleev	60d3fbbba5	Improve introduction and getters usability When someone first joins a room, they see some commands (`mailbox`, `owner`, ..) and they know they are getters and setters, but they have no good example as to how to use them. Is it `!pm mailbox SOMETHING` or `!pm mailbox=SOMETHING` or something else? It's better if the introduction text gives you the full command you need to get started (e.g. `!pm mailbox SOME_MAILBOX`), instead of a partial command that you don't know how to use (e.g. `!pm mailbox` - this is merely a getter and will not set your mailbox to `SOME_MAILBOX`). Starting from this, I thought it would be a good idea to make all option getters tell you how the commands are to be used. If you send `!pm mailbox` and it tells you "not yet set", it should also tell you how to actually set it (e.g. `!pm mailbox VALUE`).	2022-08-31 09:08:49 +03:00