diff --git a/UptimeSharp/Components/Alert.cs b/UptimeSharp/Components/Alert.cs index 197c5ee..375bc73 100644 --- a/UptimeSharp/Components/Alert.cs +++ b/UptimeSharp/Components/Alert.cs @@ -24,7 +24,7 @@ namespace UptimeSharp { "alertcontacts", alertIDs != null ? string.Join("-", alertIDs) : null } }); - return response.Items; + return response.Items ?? new List(); } @@ -59,13 +59,11 @@ namespace UptimeSharp throw new UptimeSharpException("AlertType.SMS and AlertType.Twitter are not supported by the UptimeRobot API"); } - DefaultResponse response = await Request("newAlertContact", cancellationToken, new Dictionary() + return (await Request("newAlertContact", cancellationToken, new Dictionary() { { "alertContactType", ((int)type).ToString() }, { "alertContactValue", value } - }); - - return response.Success; + })).Success; } @@ -92,17 +90,16 @@ namespace UptimeSharp /// public async Task DeleteAlert(string alertID, CancellationToken cancellationToken = default(CancellationToken)) { + // try to delete main alert if (alertID.StartsWith("0")) { throw new UptimeSharpException("Can't delete main alert"); } - DefaultResponse response = await Request("deleteAlertContact", cancellationToken, new Dictionary() + return (await Request("deleteAlertContact", cancellationToken, new Dictionary() { { "alertContactID", alertID } - }); - - return response.Success; + })).Success; } diff --git a/UptimeSharp/Components/Monitor.cs b/UptimeSharp/Components/Monitor.cs index 5c15300..291f56f 100644 --- a/UptimeSharp/Components/Monitor.cs +++ b/UptimeSharp/Components/Monitor.cs @@ -80,12 +80,10 @@ namespace UptimeSharp /// public async Task DeleteMonitor(int monitorId, CancellationToken cancellationToken = default(CancellationToken)) { - DefaultResponse response = await Request("getMonitors", cancellationToken, new Dictionary() + return (await Request("getMonitors", cancellationToken, new Dictionary() { { "monitorID", monitorId.ToString() } - }); - - return response.Success; + })).Success; } @@ -148,8 +146,7 @@ namespace UptimeSharp HTTPUsername = HTTPUsername }; - DefaultResponse response = await Request("newMonitor", cancellationToken, parameters.Convert()); - return response.Success; + return (await Request("newMonitor", cancellationToken, parameters.Convert())).Success; } @@ -194,8 +191,7 @@ namespace UptimeSharp paramList.Add("monitorID", monitor.ID.ToString()); - DefaultResponse response = await Request("editMonitor", cancellationToken, paramList); - return response.Success; + return (await Request("editMonitor", cancellationToken, paramList)).Success; } } } \ No newline at end of file