@@ -10,22 +10,6 @@ import Foundation
1010import UIKit
1111import Alamofire
1212
13−enum ResultR: Int {
14− case internalServerError = 500
15− case exceededContent = 470
16− case longContent = 471
17− case incorrectContent = 472
18− case impossibleContent = 473
19− case invalidTocken = 498
20− case alreadyRegistered = 409
21− case invalidCode = 403
22− case badAccess = 400
23− case tooMuchToAdd = 406
24− case notFound = 404
25− case success1 = 204
26− case success = 200
27−}
28−
2913class Model{
3014
3115 static let invalidTocken = 498
@@ -35,12 +19,10 @@ class Model{
3519 private static var isValidTocken: ((Int)->())? = { responce in
3620 print(responce)
3721 if responce == invalidTocken {
38−
39− DataStorage.standard.setIsLoggedIn(value: false, with: 0)
40− (UIApplication.shared.delegate as! AppDelegate).relaunch()
41−
4222 Model.logout {
4323 print("Logout Is Successful")
24+ DataStorage.standard.setIsLoggedIn(value: false, with: 0)
25+ (UIApplication.shared.delegate as! AppDelegate).relaunch()
4426 }
4527 }
4628 }
@@ -49,7 +31,6 @@ class Model{
4931 static let decoder = JSONDecoder()
5032
5133 static let authMeURL = URL(string: "\(baseUrl)/authentication/me")!
52− static let deactivateURL = URL(string: "\(baseUrl)/deactivateAll")!
5334 static let registerMeURL = URL(string: "\(baseUrl)/authentication/register")!
5435 static let authVerifyURL = URL(string: "\(baseUrl)/authentication/verify")!
5536 static let authenticationURL = URL(string:"\(baseUrl)/authentication/login")!
@@ -59,7 +40,6 @@ class Model{
5940 static let postsPublishURL = URL(string:"\(baseUrl)/posts/publish")!
6041 static let usersURL = URL(string:"\(baseUrl)/users")!
6142 static let usersAllURL = URL(string:"\(baseUrl)/users/all")!
62− static let usersUpdateURL = URL(string:"\(baseUrl)/users/update")!
6343 static let channelsGetURL = URL(string: "\(baseUrl)/channels/get")!
6444 static let channelsUpdateURL = URL(string: "\(baseUrl)/channels/update")!
6545 static let channelsListURL = URL(string: "\(baseUrl)/channels")!
@@ -228,10 +208,6 @@ class Model{
228208 AF.request(request).response { (responce) in
229209 isValidTocken?(responce.response?.statusCode ?? 498)
230210
231− if let code = responce.response?.statusCode, code == 498 {
232− return
233− }
234−
235211 completion()
236212 }
237213 }
@@ -264,14 +240,11 @@ class Model{
264240 guard let code = responce.response?.statusCode else { return }
265241 isValidTocken?(code)
266242
267− if let code = responce.response?.statusCode, code == 498 {
268− return
269− }
270−
271243 if code == 204 {
272−
273244 let fields = responce.response?.allHeaderFields as? [String :String]
245+
274246 let cookies = HTTPCookie.cookies(withResponseHeaderFields: fields!, for: responce.response!.url!)
247+
275248 HTTPCookieStorage.shared.setCookie(cookies[0])
276249
277250 completion()
@@ -291,16 +264,12 @@ class Model{
291264 guard let statusCode = responce.response?.statusCode else { completion(false); return }
292265 isValidTocken?(statusCode)
293266
294− if let code = responce.response?.statusCode, code == 498 {
295− return
296− }
297−
298267 if statusCode == 204 {
299268 // at this point cookies are set
300269 completion(true)
301− } else {
302− completion(false)
303270 }
271+
272+ completion(false)
304273 }
305274 }
306275
@@ -314,10 +283,6 @@ class Model{
314283 guard let statusCode = responce.response?.statusCode else { completion(false); return }
315284 isValidTocken?(statusCode)
316285
317− if let code = responce.response?.statusCode, code == 498 {
318− return
319− }
320−
321286 guard let json = responce.data else { return }
322287 guard let personId = Int(String(data: json, encoding: String.Encoding.utf8)!) else {
323288 completion(false)
@@ -412,10 +377,6 @@ class Model{
412377
413378 isValidTocken?(response.response?.statusCode ?? 498)
414379
415− if let code = response.response?.statusCode, code == 498 {
416− return
417− }
418−
419380 guard let json = response.data else { return }
420381
421382 guard let newQueery = try? decoder.decode(QueryPosts<Posts>.self, from: json) else { print("no")
@@ -427,7 +388,7 @@ class Model{
427388 }
428389
429390
430− static func createAndPublish(body: [Attachments], tags: [String], completion: @escaping ((ResultR)->())){
391+ static func createAndPublish(body: [Attachments], tags: [String]){
431392 let jsonUpd = CreatedPost(body: body, tags: tags)
432393 var request = URLRequest(url: postsPublishURL)
433394
@@ -441,18 +402,6 @@ class Model{
441402 (response) in
442403
443404 isValidTocken?(response.response?.statusCode ?? 498)
444−
445− if let code = response.response?.statusCode, code == 498 {
446− return
447− }
448−
449− if let code = response.response?.statusCode,
450− let result = ResultR(rawValue: code)
451− {
452− completion(result)
453− } else {
454− completion(.internalServerError)
455− }
456405 }
457406 }
458407
@@ -478,10 +427,6 @@ class Model{
478427
479428 isValidTocken?(response.response?.statusCode ?? 498)
480429
481− if let code = response.response?.statusCode, code == 498 {
482− return
483− }
484−
485430 guard let json = response.data else { return }
486431
487432 guard let newPost = try? decoder.decode(QueryPosts<Posts>.self, from: json) else { return }
@@ -494,7 +439,7 @@ class Model{
494439
495440 static func getUsers(for ids: [Int], completion: @escaping (([Int:Users])->())){
496441 let json = "\(Set(ids))"
497−
442+ print(json)
498443 var request = URLRequest(url: usersURL)
499444
500445 request.httpMethod = "POST"
@@ -508,10 +453,6 @@ class Model{
508453
509454 isValidTocken?(response.response?.statusCode ?? 498)
510455
511− if let code = response.response?.statusCode, code == 498 {
512− return
513− }
514−
515456 guard let json = response.data else { return }
516457
517458 guard let users = try? decoder.decode([Users].self, from: json) else { return }
@@ -544,9 +485,6 @@ class Model{
544485
545486 isValidTocken?(response.response?.statusCode ?? 498)
546487
547− if let code = response.response?.statusCode, code == 498 {
548− return
549− }
550488
551489 guard let json = response.data else { return }
552490
@@ -558,7 +496,7 @@ class Model{
558496 }
559497
560498
561− static func createChannel(with channel: Channels, completion: @escaping ((ResultR)->())) {
499+ static func createChannel(with channel: Channels) {
562500
563501 var request = URLRequest(url: channelsCreateURL)
564502 request.httpMethod = "POST"
@@ -569,13 +507,6 @@ class Model{
569507 (response) in
570508
571509 isValidTocken?(response.response?.statusCode ?? 498)
572−
573− if let code = response.response?.statusCode, let result = ResultR(rawValue: code) {
574− completion(result)
575− return
576− }
577−
578− completion(ResultR.internalServerError)
579510 }
580511
581512 }
@@ -588,9 +519,6 @@ class Model{
588519 AF.request(request).responseJSON { (response) in
589520
590521 isValidTocken?(response.response?.statusCode ?? 498)
591− if let code = response.response?.statusCode, code == 498 {
592− return
593− }
594522
595523 guard let json = response.data else { return }
596524
@@ -609,9 +537,6 @@ class Model{
609537
610538 AF.request(request).response { (response) in
611539 isValidTocken?(response.response?.statusCode ?? 498)
612− if let code = response.response?.statusCode, code == 498 {
613− return
614− }
615540 }
616541 completion()
617542 }
@@ -627,9 +552,6 @@ class Model{
627552 (response) in
628553
629554 isValidTocken?(response.response?.statusCode ?? 498)
630− if let code = response.response?.statusCode, code == 498 {
631− return
632− }
633555 }
634556 }
635557
@@ -652,9 +574,6 @@ class Model{
652574 }
653575
654576 isValidTocken?(response.response?.statusCode ?? 498)
655− if let code = response.response?.statusCode, code == 498 {
656− return
657− }
658577 }
659578 }
660579
@@ -730,13 +649,12 @@ class Model{
730649 (response) in
731650
732651 isValidTocken?(response.response?.statusCode ?? 498)
733− if let code = response.response?.statusCode, code == 498 {
734− return
735− }
736652
737653 guard let json = response.data else { return }
738654
739655 guard let newQueery = try? decoder.decode(QueryPosts<Posts>.self, from: json) else { return }
656+
657+ print("\(anonymousChannel) \(newQueery)")
740658 completion((newQueery.users, newQueery.response))
741659 }
742660 }
@@ -746,9 +664,6 @@ class Model{
746664 AF.request(URLRequest(url: hashTagTreeURL)).responseJSON {
747665 (response) in
748666 isValidTocken?(response.response?.statusCode ?? 498)
749− if let code = response.response?.statusCode, code == 498 {
750− return
751− }
752667 guard let json = response.data else { return }
753668 guard let tree = try? decoder.decode(CompletionTree.self, from: json) else { return }
754669 completion(tree)
@@ -766,10 +681,6 @@ class Model{
766681 AF.request(request).responseJSON { response in
767682 isValidTocken?(response.response?.statusCode ?? 498)
768683
769− if let code = response.response?.statusCode, code == 498 {
770− return
771− }
772−
773684 guard let json = response.data else { return }
774685 let dialogs = try! decoder.decode(QueryPosts<Dialog>.self, from: json)
775686
@@ -941,9 +852,6 @@ class Model{
941852 AF.request(request).response { (response) in
942853
943854 isValidTocken?(response.response?.statusCode ?? 498)
944− if let code = response.response?.statusCode, code == 498 {
945− return
946− }
947855
948856 guard let json = response.data else { return }
949857 let stringInt = String.init(data: json, encoding: String.Encoding.utf8)
@@ -953,7 +861,7 @@ class Model{
953861 }
954862 }
955863
956− static func getMessagesFor(typeOfChat: Model.Dialog, chat id: Int, exclusiveFrom: Int? = nil, limit l: Int = 25, direction: String = "backward", completion: @escaping (([LastMessage])->()))
864+ static func getMessagesFor(typeOfChat: Model.Dialog, chat id: Int, exclusiveFrom: Int? = nil, limit l: Int = 10, direction: String = "backward", completion: @escaping (([LastMessage])->()))
957865 {
958866 let req = GeneralRequest<Int>(direction: direction, limit: l, exclusiveFrom: exclusiveFrom, request: id)
959867 var request: URLRequest?
@@ -972,9 +880,6 @@ class Model{
972880 AF.request(request!).response { (response) in
973881
974882 isValidTocken?(response.response?.statusCode ?? 498)
975− if let code = response.response?.statusCode, code == 498 {
976− return
977− }
978883
979884 guard let json = response.data else { return }
980885 guard let messages = try? decoder.decode([LastMessage].self, from: json) else { return }
@@ -992,10 +897,6 @@ class Model{
992897
993898 AF.request(request).response { (response) in
994899 isValidTocken?(response.response?.statusCode ?? 498)
995−
996− if let code = response.response?.statusCode, code == 498 {
997− return
998− }
999900 }
1000901
1001902 completion()
@@ -1010,10 +911,6 @@ class Model{
1010911
1011912 AF.request(request).response { (response) in
1012913 isValidTocken?(response.response?.statusCode ?? 498)
1013−
1014− if let code = response.response?.statusCode, code == 498 {
1015− return
1016− }
1017914 }
1018915
1019916 // completion()
@@ -1056,7 +953,7 @@ class Model{
1056953 }
1057954 }
1058955
1059− static func sendMessage(message: SendMessage, completion: @escaping ((ResultR)->())){
956+ static func sendMessage(message: SendMessage, completion: @escaping (()->())){
1060957
1061958 var request = URLRequest(url: messagesSendURL)
1062959 request.setValue("application/json; charset=utf-8", forHTTPHeaderField: "Content-Type")
@@ -1066,15 +963,7 @@ class Model{
1066963 AF.request(request).response { (response) in
1067964 isValidTocken?(response.response?.statusCode ?? 498)
1068965
1069− if let code = response.response?.statusCode, code == 498 {
1070− return
1071− }
1072−
1073− if let result = ResultR(rawValue: response.response!.statusCode){
1074− completion(result)
1075− } else {
1076− completion(.internalServerError)
1077− }
966+ completion()
1078967 }
1079968 }
1080969
@@ -1087,7 +976,6 @@ class Model{
1087976 var campusCode: String
1088977 var name: String
1089978 var tags: [String]
1090− var address: String
1091979
1092980 }
1093981
@@ -1101,50 +989,10 @@ class Model{
1101989 AF.request(request).response { (response) in
1102990 isValidTocken?(response.response?.statusCode ?? 498)
1103991
1104− if let code = response.response?.statusCode, code == 498 {
1105− return
1106− }
1107−
1108992 guard let json = response.data else { return }
1109993 guard let faculties = try? decoder.decode([Faculty].self, from: json) else { return }
1110994
1111995 completion(faculties)
1112996 }
1113997 }
1114−
1115− static func userUpdate(with newUser: NewRegistration, completion: @escaping ((Bool)->())) {
1116− var request = URLRequest(url: usersUpdateURL)
1117− request.setValue("application/json; charset=utf-8", forHTTPHeaderField: "Content-Type")
1118− request.httpMethod = "POST"
1119− request.httpBody = try? JSONEncoder().encode(newUser)
1120−
1121− AF.request(request).response { (response) in
1122− isValidTocken?(response.response?.statusCode ?? 498)
1123−
1124− if let code = response.response?.statusCode, code == 498 {
1125− return
1126− }
1127−
1128− if let code = response.response?.statusCode, code != 204{
1129− completion (false)
1130− } else {
1131− completion(true)
1132− }
1133− }
1134− }
1135−
1136− static func deactivateAll(completion: @escaping (()->())){
1137− var request = URLRequest(url: deactivateURL)
1138− request.httpMethod = "DELETE"
1139−
1140− AF.request(request).response { (responce) in
1141− isValidTocken?(responce.response?.statusCode ?? 498)
1142−
1143− if let code = responce.response?.statusCode, code == 498 {
1144− return
1145− }
1146−
1147− completion()
1148− }
1149− }
1150998}