store subject and content.

override tzdata package.
Add subject and content columns to emails table.

Author: dongyuwei

.gitignore

@@ -34,4 +34,5 @@ temp_mail-*.tar
 *.iml
 
 all_files_contents.txt
-concat-files.sh
+concat-files.sh
+.aider*

lib/temp_mail/email.ex

@@ -6,6 +6,8 @@ defmodule TempMail.Email do
     field :from, :string
     field :to, {:array, :string}
     field :data, :string
+    field :subject, :string
+    field :content, :string
     field :received_at, :integer
 
     timestamps()

lib/temp_mail/email_store.ex

@@ -3,14 +3,16 @@ defmodule TempMail.EmailStore do
   alias TempMail.{Repo, Email}
   require Logger
 
-  def store_email(from, to, data) do
+  def store_email(from, to, data, subject, content) do
     Logger.info("Storing email from #{from} to #{Enum.join(to, ", ")}")
 
     email = %Email{
       from: from,
       to: to,
       data: data,
-      received_at: :os.system_time(:seconds)
+      subject: subject,
+      content: content,
+      received_at: :os.system_time(:seconds),
     }
 
     Repo.insert(email)

lib/temp_mail/smtp_server.ex

@@ -35,9 +35,73 @@ defmodule TempMail.SMTPServer do
 
   def handle_DATA(from, to, data, state) do
     Logger.info("handle_DATA, Received email from #{from} to #{Enum.join(to, ", ")}")
-    TempMail.EmailStore.store_email(from, to, data)
-    {:ok, "250 ok", state}
+
+    case :mimemail.decode(data) do
+      {"text", subtype, headers, params, body} ->
+        # Simple text email without attachments
+        email_content = %{
+          from: from,
+          to: to,
+          subject: get_subject({nil, nil, headers, params, nil}),
+          body: body,
+          attachments: []
+        }
+        Logger.debug("email_content: #{inspect(email_content)}")
+        TempMail.EmailStore.store_email(from, to, data, email_content.subject, email_content.body)
+        {:ok, "250 ok", state}
+
+      {_type, _subtype, headers, params, parts} = email ->
+        # Email with potential attachments
+        attachments = extract_attachments(email)
+        email_content = %{
+          from: from,
+          to: to,
+          subject: get_subject(email),
+          body: get_text_body(email),
+          attachments: attachments
+        }
+        {:ok, "250 ok", state}
+
+      error ->
+        {:error, "554 Error: Unable to process email", state}
+    end
+  end
+
+  defp extract_attachments({_type, _subtype, _headers, _params, parts}) when is_list(parts) do
+    Enum.flat_map(parts, fn
+      {"text", _subtype, _headers, _params, _content} ->
+        []
+      {_type, _subtype, headers, params, content} ->
+        case :proplists.get_value("Content-Disposition", headers) do
+          disposition when is_binary(disposition) ->
+            if String.starts_with?(disposition, "attachment") do
+              [%{
+                filename: :proplists.get_value("filename", params),
+                content: Base.encode64(content),
+                content_type: :proplists.get_value("Content-Type", headers)
+              }]
+            else
+              []
+            end
+          _ ->
+            []
+        end
+    end)
+  end
+  defp extract_attachments(_), do: []
+
+  defp get_subject({_type, _subtype, headers, _params, _parts}) do
+    :proplists.get_value("Subject", headers, "")
+  end
+
+  defp get_text_body({_type, _subtype, _headers, _params, parts}) when is_list(parts) do
+    Enum.find_value(parts, fn
+      {"text", "plain", _headers, _params, content} -> content
+      _ -> nil
+    end) || ""
   end
+  defp get_text_body({"text", "plain", _headers, _params, content}), do: content
+  defp get_text_body(_), do: ""
 
   def handle_RSET(state) do
     {:ok, state}

lib/temp_mail/templates/emails.html.eex

@@ -12,8 +12,9 @@
             <li>
                 <strong>From:</strong> <%= email.from %><br>
                 <strong>To:</strong> <%= Enum.join(email.to, ", ") %><br>
+                <strong>Subject:</strong> <%= email.subject %><br>
+                <strong>Content:</strong> <%= email.content %><br>
                 <strong>Received at:</strong> <%= Timex.format!(Timex.from_unix(email.received_at, :seconds), "{ISO:Extended}") %><br>
-                <pre><%= email.data %></pre>
             </li>
         <% end %>
     </ul>

mix.exs

@@ -30,7 +30,8 @@ defmodule TempMail.MixProject do
       {:iconv, "~> 1.0.10"},
       {:timex, "~> 3.0"},
       {:ecto_sql, "~> 3.0"},
-      {:ecto_sqlite3, "~> 0.7"}
+      {:ecto_sqlite3, "~> 0.7"},
+      {:tzdata, "~> 1.1.2", override: true}
     ]
   end
 end

mix.lock

@@ -35,7 +35,7 @@
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.7", "354c321cf377240c7b8716899e182ce4890c5938111a1296add3ec74cf1715df", [:make, :mix, :rebar3], [], "hexpm", "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"},
   "telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"},
   "timex": {:hex, :timex, "3.7.11", "bb95cb4eb1d06e27346325de506bcc6c30f9c6dea40d1ebe390b262fad1862d1", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.20", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 1.1", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm", "8b9024f7efbabaf9bd7aa04f65cf8dcd7c9818ca5737677c7b76acbc6a94d1aa"},
-  "tzdata": {:hex, :tzdata, "1.1.1", "20c8043476dfda8504952d00adac41c6eda23912278add38edc140ae0c5bcc46", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "a69cec8352eafcd2e198dea28a34113b60fdc6cb57eb5ad65c10292a6ba89787"},
+  "tzdata": {:hex, :tzdata, "1.1.2", "45e5f1fcf8729525ec27c65e163be5b3d247ab1702581a94674e008413eef50b", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "cec7b286e608371602318c414f344941d5eb0375e14cfdab605cca2fe66cba8b"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
   "websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"},
   "websock_adapter": {:hex, :websock_adapter, "0.5.6", "0437fe56e093fd4ac422de33bf8fc89f7bc1416a3f2d732d8b2c8fd54792fe60", [:mix], [{:bandit, ">= 0.6.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "e04378d26b0af627817ae84c92083b7e97aca3121196679b73c73b99d0d133ea"},

priv/repo/migrations/20241007123456_add_subject_and_content_to_emails.exs

@@ -0,0 +1,10 @@
+defmodule TempMail.Repo.Migrations.AddSubjectAndContentToEmails do
+  use Ecto.Migration
+
+  def change do
+    alter table(:emails) do
+      add :subject, :string
+      add :content, :text
+    end
+  end
+end