diff --git a/lib/web/email/activity.ex b/lib/web/email/activity.ex index 5626a690e..01ed0c022 100644 --- a/lib/web/email/activity.ex +++ b/lib/web/email/activity.ex @@ -27,13 +27,13 @@ defmodule Mobilizon.Web.Email.Activity do instance: Config.instance_name() ) - activities = chunk_activities(activities) + chunked_activities = chunk_activities(activities) Email.base_email(to: email, subject: subject) |> assign(:locale, locale) |> assign(:subject, subject) - |> assign(:activities, activities) - |> assign(:total_number_activities, map_size(activities)) + |> assign(:activities, chunked_activities) + |> assign(:total_number_activities, length(activities)) |> render(:email_direct_activity) end @@ -44,7 +44,7 @@ defmodule Mobilizon.Web.Email.Activity do Map.update(acc, group_id, [activity], fn activities -> activities ++ [activity] end) end) |> Enum.map(fn {key, value} -> - {key, Enum.sort(value, &(&1.inserted_at >= &2.inserted_at))} + {key, Enum.sort(value, &(&1.inserted_at <= &2.inserted_at))} end) |> Enum.map(fn {key, value} -> {key, filter_duplicates(value)} end) |> Enum.into(%{}) diff --git a/lib/web/templates/email/email_direct_activity.html.eex b/lib/web/templates/email/email_direct_activity.html.eex index 5cd57cf7c..149287484 100644 --- a/lib/web/templates/email/email_direct_activity.html.eex +++ b/lib/web/templates/email/email_direct_activity.html.eex @@ -33,7 +33,7 @@ -
+

<%= dngettext("activity", "There has been an activity!", "There has been some activity!", @total_number_activities) %>

@@ -43,17 +43,17 @@ 		-
+