github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-22 22:23:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better wording + fix mobile notifications

Browse source
This commit is contained in:
Florian Dupret 2022-01-14 12:53:06 +01:00
commit 58b398d006
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Ombi.Notifications/Agents/EmailNotification.cs
View file

@ -115,7 +115,7 @@ namespace Ombi.Notifications.Agents
var plaintext = await LoadPlainTextMessage(NotificationType.NewRequest, model, settings);
message.Other.Add("PlainTextBody", plaintext);
foreach (var recipient in (await GetPowerUsers()).DistinctBy(x => x.Email))
foreach (var recipient in (await GetPrivilegedUsers()).DistinctBy(x => x.Email))
{
if (recipient.Email.IsNullOrEmpty())
{

10
src/Ombi.Notifications/Agents/LegacyMobileNotification.cs
View file

@ -59,7 +59,7 @@ namespace Ombi.Notifications.Agents
};
// Get admin devices
var playerIds = await GetAdmins();
var playerIds = await GetPrivilegedUsersPlayerIds();
await Send(playerIds, notification, settings, model, true);
}
@ -243,14 +243,14 @@ namespace Ombi.Notifications.Agents
private async Task<List<string>> GetAdmins()
{
return await UsersToPlayerIds(await _userManager.GetUsersInRoleAsync(OmbiRoles.Admin));
return await GetNotificationRecipients(await _userManager.GetUsersInRoleAsync(OmbiRoles.Admin));
}
private async Task<List<string>> GetPowerUsersPlayerIds()
private async Task<List<string>> GetPrivilegedUsersPlayerIds()
{
return await UsersToPlayerIds(await GetPowerUsers());
return await GetNotificationRecipients(await GetPrivilegedUsers());
}
private async Task<List<string>> UsersToPlayerIds(IEnumerable<OmbiUser> users)
private async Task<List<string>> GetNotificationRecipients(IEnumerable<OmbiUser> users)
{
var adminUsers = users.Select(x => x.Id).ToList();

10
src/Ombi.Notifications/Agents/MobileNotification.cs
View file

@ -62,7 +62,7 @@ namespace Ombi.Notifications.Agents
};
// Get admin devices
var playerIds = await GetAdmins();
var playerIds = await GetPrivilegedUsersPlayerIds();
await Send(playerIds, notification, settings, model, true);
}
@ -281,14 +281,14 @@ namespace Ombi.Notifications.Agents
private async Task<List<string>> GetAdmins()
{
return await UsersToPlayerIds(await _userManager.GetUsersInRoleAsync(OmbiRoles.Admin));
return await GetNotificationRecipients(await _userManager.GetUsersInRoleAsync(OmbiRoles.Admin));
}
private async Task<List<string>> GetPowerUsersPlayerIds()
private async Task<List<string>> GetPrivilegedUsersPlayerIds()
{
return await UsersToPlayerIds(await GetPowerUsers());
return await GetNotificationRecipients(await GetPrivilegedUsers());
}
private async Task<List<string>> UsersToPlayerIds(IEnumerable<OmbiUser> users)
private async Task<List<string>> GetNotificationRecipients(IEnumerable<OmbiUser> users)
{
var adminUsers = users.Select(x => x.Id).ToList();

2
src/Ombi.Notifications/BaseNotification.cs
View file

@ -214,7 +214,7 @@ namespace Ombi.Notifications
.FirstOrDefault(x => x.Agent == agent && x.UserId == userId);
}
protected async Task<IEnumerable<OmbiUser>> GetPowerUsers()
protected async Task<IEnumerable<OmbiUser>> GetPrivilegedUsers()
{
IEnumerable<OmbiUser> recipients = await _userManager.GetUsersInRoleAsync(OmbiRoles.Admin);
recipients = recipients.Concat(await _userManager.GetUsersInRoleAsync(OmbiRoles.PowerUser));