Skip to content

Commit 948ae51

Browse files
FabioGamingFabioGaming
committed
reworked EventHandler
1 parent 8cd9ba2 commit 948ae51

2 files changed

Lines changed: 37 additions & 13 deletions

File tree

‎Amino.NET/Events/EventHandler.cs‎

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,55 +76,79 @@ public Task ReceiveEvent(string webSocketMessage, Client client)
7676
eventCall.callChatContentChangedEvent(client, _chatContentChanged);
7777
break;
7878
case 119: // MessageForceRemovedByAdmin
79-
Amino.Objects.SpecialChatEvent _messageForceRemovedByAdmin = new Objects.SpecialChatEvent(webSocketMessage);
79+
Amino.Objects.SpecialChatEvent _messageForceRemovedByAdmin = JsonSerializer.Deserialize<SpecialChatEvent>(element);
80+
_messageForceRemovedByAdmin.Json = webSocketMessage;
81+
_messageForceRemovedByAdmin.SocketBase = _socketBase;
8082
eventCall.callMessageForceRemovedByAdminEvent(client, _messageForceRemovedByAdmin);
8183
break;
8284
case 120: // ChatTip
83-
Amino.Objects.ChatTip _chatTip = new Objects.ChatTip(webSocketMessage);
85+
Amino.Objects.ChatTip _chatTip = JsonSerializer.Deserialize<ChatTip>(element);
86+
_chatTip.Json = webSocketMessage;
87+
_chatTip.SocketBase = _socketBase;
8488
eventCall.callChatTipEvent(client, _chatTip);
8589
break;
8690
case 121: // ChatAnnouncementPin
87-
Amino.Objects.ChatAnnouncement _chatAnnouncementPinEvent = new Objects.ChatAnnouncement(webSocketMessage);
91+
Amino.Objects.ChatAnnouncement _chatAnnouncementPinEvent = JsonSerializer.Deserialize<ChatAnnouncement>(element);
92+
_chatAnnouncementPinEvent.Json = webSocketMessage;
93+
_chatAnnouncementPinEvent.SocketBase = _socketBase;
8894
eventCall.callChatPinAnnouncementEvent(client, _chatAnnouncementPinEvent);
8995
break;
9096
case 125: // ChatViewModeOn
91-
Amino.Objects.ViewMode _viewModeOn = new Objects.ViewMode(webSocketMessage);
97+
Amino.Objects.ViewMode _viewModeOn = JsonSerializer.Deserialize<ViewMode>(element);
98+
_viewModeOn.Json = webSocketMessage;
99+
_viewModeOn.SocketBase = _socketBase;
92100
eventCall.callChatViewModeOnEvent(client, _viewModeOn);
93101
break;
94102
case 126: // ChatViewModeOff
95-
Amino.Objects.ViewMode _viewModeOff = new Objects.ViewMode(webSocketMessage);
103+
Amino.Objects.ViewMode _viewModeOff = JsonSerializer.Deserialize<ViewMode>(element);
104+
_viewModeOff.Json = webSocketMessage;
105+
_viewModeOff.SocketBase = _socketBase;
96106
eventCall.callChatViewModeOffEvent(client, _viewModeOff);
97107
break;
98108
case 127: // ChatAnnouncementUnPin
99-
Amino.Objects.ChatEvent _chatAnnouncementUnPin = new Objects.ChatEvent(webSocketMessage);
109+
Amino.Objects.ChatEvent _chatAnnouncementUnPin = JsonSerializer.Deserialize<ChatEvent>(element);
110+
_chatAnnouncementUnPin.Json = webSocketMessage;
111+
_chatAnnouncementUnPin.SocketBase = _socketBase;
100112
eventCall.callChatUnpinAnnouncementEvent(client, _chatAnnouncementUnPin);
101113
break;
102114
case 128: // ChatTipEnabled
103-
Amino.Objects.ChatTipToggle _chatTipEnabled = new Objects.ChatTipToggle(webSocketMessage);
115+
Amino.Objects.ChatTipToggle _chatTipEnabled = JsonSerializer.Deserialize<ChatTipToggle>(element);
116+
_chatTipEnabled.Json = webSocketMessage;
117+
_chatTipEnabled.SocketBase = _socketBase;
104118
eventCall.callChatTipEnabledEvent(client, _chatTipEnabled);
105119
break;
106120
case 129: // ChatTipDisabled
107-
Amino.Objects.ChatTipToggle _chatTipDisabled = new Objects.ChatTipToggle(webSocketMessage);
121+
Amino.Objects.ChatTipToggle _chatTipDisabled = JsonSerializer.Deserialize<ChatTipToggle>(element);
122+
_chatTipDisabled.Json = webSocketMessage;
123+
_chatTipDisabled.SocketBase = _socketBase;
108124
eventCall.callChatTipDisabledEvent(client, _chatTipDisabled);
109125
break;
110126

111127
}
112128

113129
break;
114130
case 100: //ImageMessage
115-
Amino.Objects.ImageMessage _imageMessage = new Amino.Objects.ImageMessage(webSocketMessage);
131+
Amino.Objects.ImageMessage _imageMessage = JsonSerializer.Deserialize<ImageMessage>(element);
132+
_imageMessage.Json = webSocketMessage;
133+
_imageMessage.SocketBase = _socketBase;
116134
eventCall.callImageMessageEvent(client, _imageMessage);
117135
break;
118136
case 103: //YouTubeMessage
119-
Amino.Objects.YouTubeMessage _youtubeMessage = new Objects.YouTubeMessage(webSocketMessage);
137+
Amino.Objects.YouTubeMessage _youtubeMessage = JsonSerializer.Deserialize<YouTubeMessage>(element);
138+
_youtubeMessage.Json = webSocketMessage;
139+
_youtubeMessage.SocketBase = _socketBase;
120140
eventCall.callYouTubeMessageEvent(client, _youtubeMessage);
121141
break;
122142
case 110: //VoiceMessage
123-
Amino.Objects.VoiceMessage _voiceMessage = new Objects.VoiceMessage(webSocketMessage);
143+
Amino.Objects.VoiceMessage _voiceMessage = JsonSerializer.Deserialize<VoiceMessage>(element);
144+
_voiceMessage.Json = webSocketMessage;
145+
_voiceMessage.SocketBase = _socketBase;
124146
eventCall.callVoiceMessageEvent(client, _voiceMessage);
125147
break;
126148
case 113: //StickerMessage
127-
Amino.Objects.StickerMessage _stickerMessage = new Objects.StickerMessage(webSocketMessage);
149+
Amino.Objects.StickerMessage _stickerMessage = JsonSerializer.Deserialize<StickerMessage>(element);
150+
_stickerMessage.Json = webSocketMessage;
151+
_stickerMessage.SocketBase = _socketBase;
128152
eventCall.callStickerMessageEvent(client, _stickerMessage);
129153
break;
130154
}

‎Amino.NET/Objects/ImageMessage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace Amino.Objects
66
// ROOT JSON ELEMENT: o/chatMessage
77
public class ImageMessage
88
{
9-
SocketBase SocketBase { get; set; } // NEEDS TO BE SET AFTER
9+
public SocketBase SocketBase { get; set; } // NEEDS TO BE SET AFTER
1010
public string Json { get; set; } // NEEDS TO BE SET AFTER
1111
[JsonPropertyName("mediaValue")]public string MediaUrl { get; set; }
1212
[JsonPropertyName("threadId")]public string ChatId { get; set; }

0 commit comments

Comments
 (0)