Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-16 08:25:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify notifications structure

Browse Source
This commit is contained in:
JustArchi
2017-11-18 23:55:11 +01:00
parent e5a0c10c0d
commit 38877f1c0e
2 changed files with 22 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
ArchiSteamFarm/ArchiHandler.cs
View File

@@ -252,7 +252,7 @@ namespace ArchiSteamFarm {
}
internal sealed class NotificationsCallback : CallbackMsg {
internal readonly HashSet<Notification> Notifications;
internal readonly Dictionary<ENotification, uint> Notifications;
internal NotificationsCallback(JobID jobID, CMsgClientUserNotifications msg) {
if ((jobID == null) || (msg == null)) {
@@ -262,24 +262,22 @@ namespace ArchiSteamFarm {
JobID = jobID;
// We might get null body here, and that means there are no notifications related to trading
Dictionary<ENotification, uint> notificationsMap = new Dictionary<ENotification, uint>(1) {
{ ENotification.Trading, 0 }
};
Notifications = new Dictionary<ENotification, uint>(1) { { ENotification.Trading, 0 } };
if (msg.notifications != null) {
foreach (CMsgClientUserNotifications.Notification notification in msg.notifications) {
ENotification type = (ENotification) notification.user_notification_type;
if (type == ENotification.Unknown) {
ASF.ArchiLogger.LogNullError(nameof(notification.user_notification_type));
continue;
}
notificationsMap[type] = notification.count;
}
if (msg.notifications == null) {
return;
}
Notifications = new HashSet<Notification>(notificationsMap.Select(kv => new Notification(kv.Key, kv.Value)));
foreach (CMsgClientUserNotifications.Notification notification in msg.notifications) {
ENotification type = (ENotification) notification.user_notification_type;
if (type == ENotification.Unknown) {
ASF.ArchiLogger.LogNullError(nameof(notification.user_notification_type));
continue;
}
Notifications[type] = notification.count;
}
}
internal NotificationsCallback(JobID jobID, CMsgClientItemAnnouncements msg) {
@@ -288,21 +286,7 @@ namespace ArchiSteamFarm {
}
JobID = jobID;
Notifications = new HashSet<Notification> { new Notification(ENotification.Items, msg.count_new_items) };
}
internal sealed class Notification {
internal readonly uint Count;
internal readonly ENotification Type;
internal Notification(ENotification type, uint count = 0) {
if (type == ENotification.Unknown) {
throw new ArgumentNullException(nameof(type));
}
Type = type;
Count = count;
}
Notifications = new Dictionary<ENotification, uint>(1) { { ENotification.Items, msg.count_new_items } };
}
internal enum ENotification : byte {