diff --git a/Octokit.Reactive/Clients/IObservableActivitiesClient.cs b/Octokit.Reactive/Clients/IObservableActivitiesClient.cs
index f14a93fa..4f93f640 100644
--- a/Octokit.Reactive/Clients/IObservableActivitiesClient.cs
+++ b/Octokit.Reactive/Clients/IObservableActivitiesClient.cs
@@ -6,5 +6,6 @@
IObservableWatchedClient Watching { get; }
IObservableStarredClient Starring { get; }
IObservableFeedsClient Feeds { get; }
+ IObservableNotificationsClient Notifications { get; }
}
}
\ No newline at end of file
diff --git a/Octokit.Reactive/Clients/ObservableActivitiesClient.cs b/Octokit.Reactive/Clients/ObservableActivitiesClient.cs
index df53cf7d..bf521354 100644
--- a/Octokit.Reactive/Clients/ObservableActivitiesClient.cs
+++ b/Octokit.Reactive/Clients/ObservableActivitiesClient.cs
@@ -10,6 +10,7 @@
Watching = new ObservableWatchedClient(client);
Starring = new ObservableStarredClient(client);
Feeds = new ObservableFeedsClient(client);
+ Notifications = new ObservableNotificationsClient(client);
}
public IObservableEventsClient Events { get; private set; }
@@ -18,5 +19,6 @@
public IObservableStarredClient Starring { get; private set; }
public IObservableFeedsClient Feeds { get; private set; }
+ public IObservableNotificationsClient Notifications { get; private set; }
}
}
\ No newline at end of file
diff --git a/Octokit.Reactive/Clients/ObservableNotificationsClient.cs b/Octokit.Reactive/Clients/ObservableNotificationsClient.cs
index 025b3216..1ba1bf72 100644
--- a/Octokit.Reactive/Clients/ObservableNotificationsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableNotificationsClient.cs
@@ -15,7 +15,7 @@ namespace Octokit.Reactive
Ensure.ArgumentNotNull(client, "client");
_connection = client.Connection;
- _notificationsClient = client.Notification;
+ _notificationsClient = client.Activity.Notifications;
}
///
diff --git a/Octokit.Reactive/IObservableGitHubClient.cs b/Octokit.Reactive/IObservableGitHubClient.cs
index be317491..4bb181cf 100644
--- a/Octokit.Reactive/IObservableGitHubClient.cs
+++ b/Octokit.Reactive/IObservableGitHubClient.cs
@@ -16,6 +16,7 @@
IObservableReleasesClient Release { get; }
IObservableSshKeysClient SshKey { get; }
IObservableUsersClient User { get; }
+ [System.Obsolete("Notifications are now available under the Activities client. This will be removed in a future update.")]
IObservableNotificationsClient Notification { get; }
IObservableGitDatabaseClient GitDatabase { get; }
IObservableSearchClient Search { get; }
diff --git a/Octokit/Clients/ActivitiesClient.cs b/Octokit/Clients/ActivitiesClient.cs
index 87e98e49..a921cf2e 100644
--- a/Octokit/Clients/ActivitiesClient.cs
+++ b/Octokit/Clients/ActivitiesClient.cs
@@ -19,6 +19,7 @@
Starring = new StarredClient(apiConnection);
Watching = new WatchedClient(apiConnection);
Feeds = new FeedsClient(apiConnection);
+ Notifications = new NotificationsClient(apiConnection);
}
///
@@ -37,5 +38,9 @@
/// Client for the Feeds API
///
public IFeedsClient Feeds { get; private set; }
+ ///
+ /// Client for the Notifications API
+ ///
+ public INotificationsClient Notifications { get; private set; }
}
}
diff --git a/Octokit/Clients/IActivitiesClient.cs b/Octokit/Clients/IActivitiesClient.cs
index b64f39a9..47a98769 100644
--- a/Octokit/Clients/IActivitiesClient.cs
+++ b/Octokit/Clients/IActivitiesClient.cs
@@ -27,5 +27,10 @@
/// Client for the Feeds API
///
IFeedsClient Feeds { get; }
+
+ ///
+ /// Client for the Notifications API
+ ///
+ INotificationsClient Notifications { get; }
}
}
\ No newline at end of file
diff --git a/Octokit/IGitHubClient.cs b/Octokit/IGitHubClient.cs
index 0c74bfeb..07aae0a5 100644
--- a/Octokit/IGitHubClient.cs
+++ b/Octokit/IGitHubClient.cs
@@ -116,6 +116,7 @@
///
/// Refer to the API docmentation for more information: https://developer.github.com/v3/activity/notifications/
///
+ [System.Obsolete("Notifications are now available under the Activities client. This will be removed in a future update.")]
INotificationsClient Notification { get; }
///