github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-15 09:42:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

#1459 Forgot to get the Pushbullet agent to look up the pusbullet templates rather than the Discord ones.

Browse source 
Updated the Gitchange log
This commit is contained in:
Jamie.Rees 2017-08-03 15:04:51 +01:00
parent da5a4b0641
commit a14c172618
3 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
CHANGELOG.md
View file

@ -4,6 +4,16 @@
### **New Features** ### **New Features**
- Added Pushbullet notifications #1459 #865. [Jamie.Rees]
- Update README.md. [Jamie]
- Update README.md. [Jamie]
- Update README.md. [Jamie]
- Added the logging endpoint at /api/v1/Logging for the UI logs #1465. [tidusjar]
- Change the RID. [Jamie.Rees] - Change the RID. [Jamie.Rees]
- Update README.md. [Jamie] - Update README.md. [Jamie]
@ -84,6 +94,18 @@
### **Fixes** ### **Fixes**
- Made the placeholder color on the login page a bit lighter #865. [Jamie.Rees]
- Landing and login page changes #865 #1485. [tidusjar]
- #1458 #865 More work on landing. [Jamie.Rees]
- Working on the landing page #1458 #865. [tidusjar]
- A lot of clean up and added a new Image api #865. [Jamie.Rees]
- Cleaned up the Logging API slightly #1465 #865. [Jamie.Rees]
- Fixed the Identity Server discovery bug #1456 #865. [tidusjar] - Fixed the Identity Server discovery bug #1456 #865. [tidusjar]
- Fixed the issue with the Identity Server running on a different port, we can now use -url #865. [Jamie.Rees] - Fixed the issue with the Identity Server running on a different port, we can now use -url #865. [Jamie.Rees]

1
src/Ombi.Helpers/LoggingEvents.cs
View file

@ -16,6 +16,7 @@ namespace Ombi.Helpers
public static EventId Notification => new EventId(4000); public static EventId Notification => new EventId(4000);
public static EventId DiscordNotification => new EventId(4001); public static EventId DiscordNotification => new EventId(4001);
public static EventId PushbulletNotification => new EventId(4002);
public static EventId TvSender => new EventId(5000); public static EventId TvSender => new EventId(5000);
public static EventId SonarrSender => new EventId(5001); public static EventId SonarrSender => new EventId(5001);

12
src/Ombi.Notifications/Agents/PushbulletNotification.cs
View file

@ -42,7 +42,7 @@ namespace Ombi.Notifications.Agents
protected override async Task NewRequest(NotificationOptions model, PushbulletSettings settings) protected override async Task NewRequest(NotificationOptions model, PushbulletSettings settings)
{ {
var parsed = await LoadTemplate(NotificationAgent.Discord, NotificationType.NewRequest, model); var parsed = await LoadTemplate(NotificationAgent.Pushbullet, NotificationType.NewRequest, model);
var notification = new NotificationMessage var notification = new NotificationMessage
{ {
@ -54,7 +54,7 @@ namespace Ombi.Notifications.Agents
protected override async Task Issue(NotificationOptions model, PushbulletSettings settings) protected override async Task Issue(NotificationOptions model, PushbulletSettings settings)
{ {
var parsed = await LoadTemplate(NotificationAgent.Discord, NotificationType.Issue, model); var parsed = await LoadTemplate(NotificationAgent.Pushbullet, NotificationType.Issue, model);
var notification = new NotificationMessage var notification = new NotificationMessage
{ {
@ -87,7 +87,7 @@ namespace Ombi.Notifications.Agents
protected override async Task RequestDeclined(NotificationOptions model, PushbulletSettings settings) protected override async Task RequestDeclined(NotificationOptions model, PushbulletSettings settings)
{ {
var parsed = await LoadTemplate(NotificationAgent.Discord, NotificationType.RequestDeclined, model); var parsed = await LoadTemplate(NotificationAgent.Pushbullet, NotificationType.RequestDeclined, model);
var notification = new NotificationMessage var notification = new NotificationMessage
{ {
@ -98,7 +98,7 @@ namespace Ombi.Notifications.Agents
protected override async Task RequestApproved(NotificationOptions model, PushbulletSettings settings) protected override async Task RequestApproved(NotificationOptions model, PushbulletSettings settings)
{ {
var parsed = await LoadTemplate(NotificationAgent.Discord, NotificationType.RequestApproved, model); var parsed = await LoadTemplate(NotificationAgent.Pushbullet, NotificationType.RequestApproved, model);
var notification = new NotificationMessage var notification = new NotificationMessage
{ {
@ -110,7 +110,7 @@ namespace Ombi.Notifications.Agents
protected override async Task AvailableRequest(NotificationOptions model, PushbulletSettings settings) protected override async Task AvailableRequest(NotificationOptions model, PushbulletSettings settings)
{ {
var parsed = await LoadTemplate(NotificationAgent.Discord, NotificationType.RequestAvailable, model); var parsed = await LoadTemplate(NotificationAgent.Pushbullet, NotificationType.RequestAvailable, model);
var notification = new NotificationMessage var notification = new NotificationMessage
{ {
@ -127,7 +127,7 @@ namespace Ombi.Notifications.Agents
} }
catch (Exception e) catch (Exception e)
{ {
Logger.LogError(LoggingEvents.DiscordNotification, e, "Failed to send Pushbullet Notification"); Logger.LogError(LoggingEvents.PushbulletNotification, e, "Failed to send Pushbullet Notification");
} }
} }