@@ -46,7 +46,7 @@ public final class _ObjCMessage: NSObject {
46
46
47
47
@objc ( getAttachment)
48
48
public func getAttachment( ) -> _ObjCMessageAttachment ? {
49
- if let attachment = message. getAttachment ( ) {
49
+ if let attachment = message. getData ( ) ? . getAttachment ( ) {
50
50
return _ObjCMessageAttachment ( messageAttachment: attachment)
51
51
}
52
52
@@ -55,7 +55,7 @@ public final class _ObjCMessage: NSObject {
55
55
56
56
@objc ( getData)
57
57
public func getData( ) -> [ String : Any ] ? {
58
- if let data = message. getData ( ) {
58
+ if let data = message. getRawData ( ) {
59
59
var objCData = [ String: Any] ( )
60
60
for key in data. keys {
61
61
if let value = data [ key] {
@@ -92,9 +92,9 @@ public final class _ObjCMessage: NSObject {
92
92
@objc ( getSendStatus)
93
93
public func getSendStatus( ) -> _ObjCMessageSendStatus {
94
94
switch message. getSendStatus ( ) {
95
- case . SENDING :
95
+ case . sending :
96
96
return . SENDING
97
- case . SENT :
97
+ case . sent :
98
98
return . SENT
99
99
}
100
100
}
@@ -112,26 +112,28 @@ public final class _ObjCMessage: NSObject {
112
112
@objc ( getType)
113
113
public func getType( ) -> _ObjCMessageType {
114
114
switch message. getType ( ) {
115
- case . ACTION_REQUEST :
115
+ case . actionRequest :
116
116
return . ACTION_REQUEST
117
- case . CONTACTS_REQUEST :
117
+ case . contactInformationRequest :
118
118
return . CONTACTS_REQUEST
119
- case . FILE_FROM_OPERATOR :
119
+ case . fileFromOperator :
120
120
return . FILE_FROM_OPERATOR
121
- case . FILE_FROM_VISITOR :
121
+ case . fileFromVisitor :
122
122
return . FILE_FROM_VISITOR
123
- case . INFO :
123
+ case . info :
124
124
return . INFO
125
- case . OPERATOR :
125
+ case . operatorMessage :
126
126
return . OPERATOR
127
- case . OPERATOR_BUSY :
127
+ case . operatorBusy :
128
128
return . OPERATOR_BUSY
129
- case . VISITOR :
129
+ case . visitorMessage :
130
130
return . VISITOR
131
- case . KEYBOARD :
131
+ case . keyboard :
132
132
return . KEYBOARD
133
- case . KEYBOARD_RESPONSE :
133
+ case . keyboardResponse :
134
134
return . KEYBOARD_RESPONSE
135
+ case . stickerVisitor:
136
+ return . STICKER_VISITOR
135
137
}
136
138
}
137
139
@@ -169,18 +171,18 @@ public final class _ObjCMessageAttachment: NSObject {
169
171
// MARK: - Methods
170
172
171
173
@objc ( getContentType)
172
- public func getContentType( ) -> String {
173
- return messageAttachment. getContentType ( )
174
+ public func getContentType( ) -> String ? {
175
+ return messageAttachment. getFileInfo ( ) . getContentType ( )
174
176
}
175
177
176
178
@objc ( getFileName)
177
179
public func getFileName( ) -> String {
178
- return messageAttachment. getFileName ( )
180
+ return messageAttachment. getFileInfo ( ) . getFileName ( )
179
181
}
180
182
181
183
@objc ( getImageInfo)
182
184
public func getImageInfo( ) -> _ObjCImageInfo ? {
183
- if let imageInfo = messageAttachment. getImageInfo ( ) {
185
+ if let imageInfo = messageAttachment. getFileInfo ( ) . getImageInfo ( ) {
184
186
return _ObjCImageInfo ( imageInfo: imageInfo)
185
187
}
186
188
@@ -189,12 +191,12 @@ public final class _ObjCMessageAttachment: NSObject {
189
191
190
192
@objc ( getSize)
191
193
public func getSize( ) -> NSNumber ? {
192
- return messageAttachment. getSize ( ) as NSNumber ?
194
+ return messageAttachment. getFileInfo ( ) . getSize ( ) as NSNumber ?
193
195
}
194
196
195
197
@objc ( getURL)
196
- public func getURL( ) -> URL {
197
- return messageAttachment. getURL ( )
198
+ public func getURL( ) -> URL ? {
199
+ return messageAttachment. getFileInfo ( ) . getURL ( )
198
200
}
199
201
200
202
}
@@ -241,11 +243,12 @@ public enum _ObjCMessageType: Int {
241
243
case FILE_FROM_OPERATOR
242
244
case FILE_FROM_VISITOR
243
245
case INFO
246
+ case KEYBOARD
247
+ case KEYBOARD_RESPONSE
244
248
case OPERATOR
245
249
case OPERATOR_BUSY
246
250
case VISITOR
247
- case KEYBOARD
248
- case KEYBOARD_RESPONSE
251
+ case STICKER_VISITOR
249
252
}
250
253
251
254
// MARK: - MessageSendStatus
0 commit comments