open-source-mirrors
/
Prowlarr
mirror of https://github.com/Prowlarr/Prowlarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed: Fallback to Instance Name for Discord notifications

Browse Source 
(cherry picked from commit b99e06acc0a3ecae2857d9225b35424c82c67a2b)
master
Stevie Robinson 4 days ago committed by Bogdan
parent 59b5d2fc78
commit 790feed5ab
1 changed files with 70 additions and 90 deletions
Show Stats Download Patch File Download Diff File

160
src/NzbDrone.Core/Notifications/Discord/Discord.cs
Unescape View File

@ -2,6 +2,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using FluentValidation.Results; using FluentValidation.Results;
using NzbDrone.Common.Extensions; using NzbDrone.Common.Extensions;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Notifications.Discord.Payloads; using NzbDrone.Core.Notifications.Discord.Payloads;
using NzbDrone.Core.Validation; using NzbDrone.Core.Validation;
@ -10,10 +11,12 @@ namespace NzbDrone.Core.Notifications.Discord
public class Discord : NotificationBase<DiscordSettings> public class Discord : NotificationBase<DiscordSettings>
{ {
private readonly IDiscordProxy _proxy; private readonly IDiscordProxy _proxy;
private readonly IConfigFileProvider _configFileProvider;
public Discord(IDiscordProxy proxy) public Discord(IDiscordProxy proxy, IConfigFileProvider configFileProvider)
{ {
_proxy = proxy; _proxy = proxy;
_configFileProvider = configFileProvider;
} }
public override string Name => "Discord"; public override string Name => "Discord";
@ -22,18 +25,18 @@ namespace NzbDrone.Core.Notifications.Discord
public override void OnGrab(GrabMessage message) public override void OnGrab(GrabMessage message)
{ {
var embed = new Embed var embed = new Embed
{ {
Author = new DiscordAuthor Author = new DiscordAuthor
{ {
Name = Settings.Author.IsNullOrWhiteSpace() ? Environment.MachineName : Settings.Author, Name = Settings.Author.IsNullOrWhiteSpace() ? _configFileProvider.InstanceName : Settings.Author,
IconUrl = "https://raw.githubusercontent.com/Prowlarr/Prowlarr/develop/Logo/256.png" IconUrl = "https://raw.githubusercontent.com/Prowlarr/Prowlarr/develop/Logo/256.png"
}, },
Title = RELEASE_GRABBED_TITLE, Title = RELEASE_GRABBED_TITLE,
Description = message.Message, Description = message.Message,
Timestamp = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ss.fffZ"), Timestamp = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ss.fffZ"),
Color = message.Successful ? (int)DiscordColors.Success : (int)DiscordColors.Danger, Color = message.Successful ? (int)DiscordColors.Success : (int)DiscordColors.Danger,
Fields = new List<DiscordField>() Fields = new List<DiscordField>()
}; };
foreach (var field in Settings.GrabFields) foreach (var field in Settings.GrabFields)
{ {
@ -80,81 +83,72 @@ namespace NzbDrone.Core.Notifications.Discord
public override void OnHealthIssue(HealthCheck.HealthCheck healthCheck) public override void OnHealthIssue(HealthCheck.HealthCheck healthCheck)
{ {
var attachments = new List<Embed> var embed = new Embed
{ {
new Embed Author = new DiscordAuthor
{ {
Author = new DiscordAuthor Name = Settings.Author.IsNullOrWhiteSpace() ? _configFileProvider.InstanceName : Settings.Author,
{ IconUrl = "https://raw.githubusercontent.com/Prowlarr/Prowlarr/develop/Logo/256.png"
Name = Settings.Author.IsNullOrWhiteSpace() ? Environment.MachineName : Settings.Author, },
IconUrl = "https://raw.githubusercontent.com/Prowlarr/Prowlarr/develop/Logo/256.png" Title = healthCheck.Source.Name,
}, Description = healthCheck.Message,
Title = healthCheck.Source.Name, Timestamp = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ss.fffZ"),
Description = healthCheck.Message, Color = healthCheck.Type == HealthCheck.HealthCheckResult.Warning ? (int)DiscordColors.Warning : (int)DiscordColors.Danger
Timestamp = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ss.fffZ"), };
Color = healthCheck.Type == HealthCheck.HealthCheckResult.Warning ? (int)DiscordColors.Warning : (int)DiscordColors.Danger
} var payload = CreatePayload(null, new List<Embed> { embed });
};
var payload = CreatePayload(null, attachments);
_proxy.SendPayload(payload, Settings); _proxy.SendPayload(payload, Settings);
} }
public override void OnHealthRestored(HealthCheck.HealthCheck previousCheck) public override void OnHealthRestored(HealthCheck.HealthCheck previousCheck)
{ {
var attachments = new List<Embed> var embed = new Embed
{ {
new Embed Author = new DiscordAuthor
{ {
Author = new DiscordAuthor Name = Settings.Author.IsNullOrWhiteSpace() ? _configFileProvider.InstanceName : Settings.Author,
{ IconUrl = "https://raw.githubusercontent.com/Prowlarr/Prowlarr/develop/Logo/256.png"
Name = Settings.Author.IsNullOrWhiteSpace() ? Environment.MachineName : Settings.Author, },
IconUrl = "https://raw.githubusercontent.com/Prowlarr/Prowlarr/develop/Logo/256.png" Title = "Health Issue Resolved: " + previousCheck.Source.Name,
}, Description = $"The following issue is now resolved: {previousCheck.Message}",
Title = "Health Issue Resolved: " + previousCheck.Source.Name, Timestamp = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ss.fffZ"),
Description = $"The following issue is now resolved: {previousCheck.Message}", Color = (int)DiscordColors.Success
Timestamp = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ss.fffZ"), };
Color = (int)DiscordColors.Success
} var payload = CreatePayload(null, new List<Embed> { embed });
};
var payload = CreatePayload(null, attachments);
_proxy.SendPayload(payload, Settings); _proxy.SendPayload(payload, Settings);
} }
public override void OnApplicationUpdate(ApplicationUpdateMessage updateMessage) public override void OnApplicationUpdate(ApplicationUpdateMessage updateMessage)
{ {
var attachments = new List<Embed> var embed = new Embed
{ {
new Embed Author = new DiscordAuthor
{ {
Author = new DiscordAuthor Name = Settings.Author.IsNullOrWhiteSpace() ? _configFileProvider.InstanceName : Settings.Author,
{ IconUrl = "https://raw.githubusercontent.com/Prowlarr/Prowlarr/develop/Logo/256.png"
Name = Settings.Author.IsNullOrWhiteSpace() ? Environment.MachineName : Settings.Author, },
IconUrl = "https://raw.githubusercontent.com/Prowlarr/Prowlarr/develop/Logo/256.png" Title = APPLICATION_UPDATE_TITLE,
}, Timestamp = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ss.fffZ"),
Title = APPLICATION_UPDATE_TITLE, Color = (int)DiscordColors.Standard,
Timestamp = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ss.fffZ"), Fields = new List<DiscordField>
Color = (int)DiscordColors.Standard, {
Fields = new List<DiscordField>() new ()
{ {
new DiscordField() Name = "Previous Version",
{ Value = updateMessage.PreviousVersion.ToString()
Name = "Previous Version", },
Value = updateMessage.PreviousVersion.ToString() new ()
}, {
new DiscordField() Name = "New Version",
{ Value = updateMessage.NewVersion.ToString()
Name = "New Version", }
Value = updateMessage.NewVersion.ToString() },
} };
},
} var payload = CreatePayload(null, new List<Embed> { embed });
};
var payload = CreatePayload(null, attachments);
_proxy.SendPayload(payload, Settings); _proxy.SendPayload(payload, Settings);
} }
@ -208,19 +202,5 @@ namespace NzbDrone.Core.Notifications.Discord
return payload; return payload;
} }
private static string BytesToString(long byteCount)
{
string[] suf = { "B", "KB", "MB", "GB", "TB", "PB", "EB" }; //Longs run out around EB
if (byteCount == 0)
{
return "0 " + suf[0];
}
var bytes = Math.Abs(byteCount);
var place = Convert.ToInt32(Math.Floor(Math.Log(bytes, 1024)));
var num = Math.Round(bytes / Math.Pow(1024, place), 1);
return string.Format("{0} {1}", (Math.Sign(byteCount) * num).ToString(), suf[place]);
}
} }
} }

Write Preview
Loading…
Cancel
Save