hamlab/mobilizon-frontend
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add missing group name to activity notifications

Browse Source 
Closes #799

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel
2021-11-17 16:25:21 +01:00
parent cc9c2c878c
commit ba7f03610c
75 changed files with 5341 additions and 2310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
lib/service/activity/renderer/discussion.ex
View File

@@ -17,65 +17,91 @@ defmodule Mobilizon.Service.Activity.Renderer.Discussion do
Gettext.put_locale(locale)
profile = profile(activity)
title = title(activity)
group = group(activity)
case activity.subject do
:discussion_created ->
%{
body:
dgettext("activity", "%{profile} created the discussion %{discussion}.", %{
profile: profile,
discussion: title
}),
dgettext(
"activity",
"%{profile} created the discussion %{discussion} in group {group}.",
%{
profile: profile,
discussion: title,
group: group
}
),
url: discussion_url(activity)
}
:discussion_replied ->
%{
body:
dgettext("activity", "%{profile} replied to the discussion %{discussion}.", %{
profile: profile,
discussion: title
}),
dgettext(
"activity",
"%{profile} replied to the discussion %{discussion} in group {group}.",
%{
profile: profile,
discussion: title
}
),
url: discussion_url(activity)
}
:discussion_mention ->
%{
body:
dgettext("activity", "%{profile} mentionned you in the discussion %{discussion}.", %{
profile: profile,
discussion: title
}),
dgettext(
"activity",
"%{profile} mentionned you in the discussion %{discussion} in group {group}.",
%{
profile: profile,
discussion: title
}
),
url: discussion_url(activity)
}
:discussion_renamed ->
%{
body:
dgettext("activity", "%{profile} renamed the discussion %{discussion}.", %{
profile: profile,
discussion: title
}),
dgettext(
"activity",
"%{profile} renamed the discussion %{discussion} in group {group}.",
%{
profile: profile,
discussion: title
}
),
url: discussion_url(activity)
}
:discussion_archived ->
%{
body:
dgettext("activity", "%{profile} archived the discussion %{discussion}.", %{
profile: profile,
discussion: title
}),
dgettext(
"activity",
"%{profile} archived the discussion %{discussion} in group {group}.",
%{
profile: profile,
discussion: title
}
),
url: discussion_url(activity)
}
:discussion_deleted ->
%{
body:
dgettext("activity", "%{profile} deleted the discussion %{discussion}.", %{
profile: profile,
discussion: title
}),
dgettext(
"activity",
"%{profile} deleted the discussion %{discussion} in group {group}.",
%{
profile: profile,
discussion: title
}
),
url: nil
}
end
@@ -91,8 +117,10 @@ defmodule Mobilizon.Service.Activity.Renderer.Discussion do
|> URI.decode()
end
defp profile(%Activity{author: author}), do: Actor.display_name_and_username(author)
defp profile(%Activity{author: author}), do: Actor.display_name(author)
defp title(%Activity{subject_params: %{"discussion_title" => discussion_title}}),
do: discussion_title
defp group(%Activity{group: group}), do: Actor.display_name(group)
end