diff --git a/Cactacea.podspec b/Cactacea.podspec index 3d95622..91a4116 100644 --- a/Cactacea.podspec +++ b/Cactacea.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Cactacea' - s.version = '19.1.2' + s.version = '19.3.0' s.summary = 'Cactacea iOS SDK' s.description = 'An iOS library to interface with Cactacea backend API' s.ios.deployment_target = '9.0' diff --git a/Cactacea/Classes/Swaggers/APIs/AccountsAPI.swift b/Cactacea/Classes/Swaggers/APIs/AccountsAPI.swift index f3ec89f..b77b690 100644 --- a/Cactacea/Classes/Swaggers/APIs/AccountsAPI.swift +++ b/Cactacea/Classes/Swaggers/APIs/AccountsAPI.swift @@ -120,10 +120,10 @@ open class AccountsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -238,10 +238,10 @@ open class AccountsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -292,10 +292,10 @@ open class AccountsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -391,10 +391,10 @@ open class AccountsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -412,10 +412,10 @@ open class AccountsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -508,10 +508,10 @@ open class AccountsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -529,10 +529,10 @@ open class AccountsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -625,10 +625,10 @@ open class AccountsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -646,10 +646,10 @@ open class AccountsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -766,10 +766,10 @@ open class AccountsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -889,10 +889,10 @@ open class AccountsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -945,10 +945,10 @@ open class AccountsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -1076,10 +1076,10 @@ open class AccountsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -1130,10 +1130,10 @@ open class AccountsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, diff --git a/Cactacea/Classes/Swaggers/APIs/BlocksAPI.swift b/Cactacea/Classes/Swaggers/APIs/BlocksAPI.swift index c8a15c0..da0b484 100644 --- a/Cactacea/Classes/Swaggers/APIs/BlocksAPI.swift +++ b/Cactacea/Classes/Swaggers/APIs/BlocksAPI.swift @@ -64,10 +64,10 @@ open class BlocksAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -85,10 +85,10 @@ open class BlocksAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, diff --git a/Cactacea/Classes/Swaggers/APIs/CommentLikesAPI.swift b/Cactacea/Classes/Swaggers/APIs/CommentLikesAPI.swift index 8e094c1..68d7d18 100644 --- a/Cactacea/Classes/Swaggers/APIs/CommentLikesAPI.swift +++ b/Cactacea/Classes/Swaggers/APIs/CommentLikesAPI.swift @@ -66,10 +66,10 @@ open class CommentLikesAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -87,10 +87,10 @@ open class CommentLikesAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, diff --git a/Cactacea/Classes/Swaggers/APIs/CommentsAPI.swift b/Cactacea/Classes/Swaggers/APIs/CommentsAPI.swift index 14a8981..78829a3 100644 --- a/Cactacea/Classes/Swaggers/APIs/CommentsAPI.swift +++ b/Cactacea/Classes/Swaggers/APIs/CommentsAPI.swift @@ -129,10 +129,10 @@ open class CommentsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -227,10 +227,10 @@ open class CommentsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -258,10 +258,10 @@ open class CommentsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, diff --git a/Cactacea/Classes/Swaggers/APIs/FeedLikesAPI.swift b/Cactacea/Classes/Swaggers/APIs/FeedLikesAPI.swift index 115af87..aeac7f7 100644 --- a/Cactacea/Classes/Swaggers/APIs/FeedLikesAPI.swift +++ b/Cactacea/Classes/Swaggers/APIs/FeedLikesAPI.swift @@ -66,10 +66,10 @@ open class FeedLikesAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -87,10 +87,10 @@ open class FeedLikesAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, diff --git a/Cactacea/Classes/Swaggers/APIs/FeedsAPI.swift b/Cactacea/Classes/Swaggers/APIs/FeedsAPI.swift index ac4b79e..c734900 100644 --- a/Cactacea/Classes/Swaggers/APIs/FeedsAPI.swift +++ b/Cactacea/Classes/Swaggers/APIs/FeedsAPI.swift @@ -150,10 +150,10 @@ open class FeedsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -281,10 +281,10 @@ open class FeedsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -335,10 +335,10 @@ open class FeedsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, diff --git a/Cactacea/Classes/Swaggers/APIs/GroupsAPI.swift b/Cactacea/Classes/Swaggers/APIs/GroupsAPI.swift index 0a10be1..1c50fd4 100644 --- a/Cactacea/Classes/Swaggers/APIs/GroupsAPI.swift +++ b/Cactacea/Classes/Swaggers/APIs/GroupsAPI.swift @@ -218,10 +218,10 @@ open class GroupsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -274,10 +274,10 @@ open class GroupsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -399,10 +399,10 @@ open class GroupsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -536,10 +536,10 @@ open class GroupsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -592,10 +592,10 @@ open class GroupsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, diff --git a/Cactacea/Classes/Swaggers/APIs/MessagesAPI.swift b/Cactacea/Classes/Swaggers/APIs/MessagesAPI.swift index 4fd2fdf..d431032 100644 --- a/Cactacea/Classes/Swaggers/APIs/MessagesAPI.swift +++ b/Cactacea/Classes/Swaggers/APIs/MessagesAPI.swift @@ -150,10 +150,10 @@ open class MessagesAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -195,10 +195,10 @@ open class MessagesAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -311,10 +311,10 @@ open class MessagesAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -416,10 +416,10 @@ open class MessagesAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, diff --git a/Cactacea/Classes/Swaggers/APIs/SessionAPI.swift b/Cactacea/Classes/Swaggers/APIs/SessionAPI.swift index c722150..cda79c6 100644 --- a/Cactacea/Classes/Swaggers/APIs/SessionAPI.swift +++ b/Cactacea/Classes/Swaggers/APIs/SessionAPI.swift @@ -185,10 +185,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -206,10 +206,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -330,10 +330,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -384,10 +384,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -479,10 +479,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -500,10 +500,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -592,10 +592,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -613,10 +613,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -711,10 +711,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -738,10 +738,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -844,10 +844,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -865,10 +865,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -963,10 +963,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -1015,10 +1015,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -1047,10 +1047,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -1099,10 +1099,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -1228,10 +1228,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -1284,10 +1284,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -1411,10 +1411,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -1467,10 +1467,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -1594,10 +1594,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -1648,10 +1648,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -1743,10 +1743,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -1764,10 +1764,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -1850,10 +1850,10 @@ open class SessionAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, diff --git a/Cactacea/Classes/Swaggers/APIs/SessionsAPI.swift b/Cactacea/Classes/Swaggers/APIs/SessionsAPI.swift index 64d86fe..939d9e8 100644 --- a/Cactacea/Classes/Swaggers/APIs/SessionsAPI.swift +++ b/Cactacea/Classes/Swaggers/APIs/SessionsAPI.swift @@ -63,10 +63,10 @@ open class SessionsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, @@ -148,10 +148,10 @@ open class SessionsAPI { "accountName" : "accountName", "displayName" : "displayName", "joinedAt" : 7.061401241503109105224211816675961017608642578125, + "feedCount" : 5, "bio" : "bio", "followingCount" : 6, "friendRequestInProgress" : true, - "feedsCount" : 5, "muting" : true, "web" : "web", "blocking" : true, diff --git a/Cactacea/Classes/Swaggers/Models/Account.swift b/Cactacea/Classes/Swaggers/Models/Account.swift index 4f0024c..6ec4337 100644 --- a/Cactacea/Classes/Swaggers/Models/Account.swift +++ b/Cactacea/Classes/Swaggers/Models/Account.swift @@ -22,7 +22,7 @@ open class Account: Codable { public var followingCount: Int64 public var followerCount: Int64 public var friendCount: Int64 - public var feedsCount: Int64 + public var feedCount: Int64 public var muting: Bool public var blocking: Bool public var web: String? @@ -34,7 +34,7 @@ open class Account: Codable { - public init(id: Int64, accountName: String, displayName: String, profileImageUrl: String?, isFriend: Bool, friendRequestInProgress: Bool, following: Bool, isFollower: Bool, followingCount: Int64, followerCount: Int64, friendCount: Int64, feedsCount: Int64, muting: Bool, blocking: Bool, web: String?, birthday: Int64?, location: String?, bio: String?, joinedAt: Int64?, next: Int64?) { + public init(id: Int64, accountName: String, displayName: String, profileImageUrl: String?, isFriend: Bool, friendRequestInProgress: Bool, following: Bool, isFollower: Bool, followingCount: Int64, followerCount: Int64, friendCount: Int64, feedCount: Int64, muting: Bool, blocking: Bool, web: String?, birthday: Int64?, location: String?, bio: String?, joinedAt: Int64?, next: Int64?) { self.id = id self.accountName = accountName self.displayName = displayName @@ -46,7 +46,7 @@ open class Account: Codable { self.followingCount = followingCount self.followerCount = followerCount self.friendCount = friendCount - self.feedsCount = feedsCount + self.feedCount = feedCount self.muting = muting self.blocking = blocking self.web = web @@ -75,7 +75,7 @@ open class Account: Codable { try container.encode(followingCount, forKey: "followingCount") try container.encode(followerCount, forKey: "followerCount") try container.encode(friendCount, forKey: "friendCount") - try container.encode(feedsCount, forKey: "feedsCount") + try container.encode(feedCount, forKey: "feedCount") try container.encode(muting, forKey: "muting") try container.encode(blocking, forKey: "blocking") try container.encodeIfPresent(web, forKey: "web") @@ -102,7 +102,7 @@ open class Account: Codable { followingCount = try container.decode(Int64.self, forKey: "followingCount") followerCount = try container.decode(Int64.self, forKey: "followerCount") friendCount = try container.decode(Int64.self, forKey: "friendCount") - feedsCount = try container.decode(Int64.self, forKey: "feedsCount") + feedCount = try container.decode(Int64.self, forKey: "feedCount") muting = try container.decode(Bool.self, forKey: "muting") blocking = try container.decode(Bool.self, forKey: "blocking") web = try container.decodeIfPresent(String.self, forKey: "web") diff --git a/Example/Cactacea/AppDelegate.swift b/Example/Cactacea/AppDelegate.swift index e507ef2..b71e995 100644 --- a/Example/Cactacea/AppDelegate.swift +++ b/Example/Cactacea/AppDelegate.swift @@ -38,13 +38,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate, OSSubscriptionObserver { } - CactaceaAPI.basePath = "http://10.0.1.6:9000" + CactaceaAPI.basePath = "http://10.0.1.5:9000" CactaceaAPI.customHeaders["X-API-KEY"] = "78290547-ddd6-4cf2-8fe4-7dd241da3061" CactaceaAPI.customHeaders["Content-Type"] = "application/json" let notificationReceivedBlock: OSHandleNotificationReceivedBlock = { notification in - print("Received Notification: \(notification!.payload.notificationID)") + print("Received Notification: \(String(describing: notification!.payload.notificationID))") } let notificationOpenedBlock: OSHandleNotificationActionBlock = { result in @@ -52,7 +52,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, OSSubscriptionObserver { let payload: OSNotificationPayload = result!.notification.payload var fullMessage = payload.body - print("Message = \(fullMessage)") + print("Message = \(String(describing: fullMessage))") if payload.additionalData != nil { if payload.title != nil { @@ -62,7 +62,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, OSSubscriptionObserver { let additionalData = payload.additionalData if additionalData?["actionSelected"] != nil { - fullMessage = fullMessage! + "\nPressed ButtonID: \(additionalData!["actionSelected"])" + fullMessage = fullMessage! + "\nPressed ButtonID: \(String(describing: additionalData!["actionSelected"]))" } } } @@ -88,7 +88,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, OSSubscriptionObserver { if !stateChanges.from.subscribed && stateChanges.to.subscribed { print("Subscribed for OneSignal push notifications!") } - print("SubscriptionStateChange: \n\(stateChanges)") + print("SubscriptionStateChange: \n\(String(describing: stateChanges))") //The player id is inside stateChanges. But be careful, this value can be nil if the user has not granted you permission to send notifications. Session.playerId = stateChanges.to.userId diff --git a/Example/Cactacea/Base.lproj/Main.storyboard b/Example/Cactacea/Base.lproj/Main.storyboard index 3f28366..007093f 100644 --- a/Example/Cactacea/Base.lproj/Main.storyboard +++ b/Example/Cactacea/Base.lproj/Main.storyboard @@ -54,7 +54,7 @@ - + @@ -178,7 +178,7 @@ - + diff --git a/Example/Cactacea/ChatViewController.swift b/Example/Cactacea/ChatViewController.swift index f0ddc42..f5c7846 100644 --- a/Example/Cactacea/ChatViewController.swift +++ b/Example/Cactacea/ChatViewController.swift @@ -87,6 +87,8 @@ class ChatViewController: MessagesViewController, MessagesDataSource { // } if let account = account { + self.title = account.displayName + AccountsAPI.findGroup(id: account.id) { [weak self] (result, error) in guard let weakSelf = self else { return } if let result = result { @@ -102,7 +104,7 @@ class ChatViewController: MessagesViewController, MessagesDataSource { configureMessageCollectionView() configureMessageInputBar() loadFirstMessages() - title = "MessageKit" +// title = "MessageKit" } func sendCommand(name: String, value: String) { diff --git a/Example/Cactacea/MyProfileHeaderReusableView.swift b/Example/Cactacea/MyProfileHeaderReusableView.swift index b210d93..33324d1 100644 --- a/Example/Cactacea/MyProfileHeaderReusableView.swift +++ b/Example/Cactacea/MyProfileHeaderReusableView.swift @@ -43,9 +43,9 @@ class MyProfileHeaderReusableView: UICollectionReusableView { profileImage.af_setImage(withURLRequest: urlRequest, imageTransition: .crossDissolve(0.2)) } - self.postsCountLabel.text = "\(account.feedsCount ?? 0)" - self.followingCountLabel.text = "\(account.followingCount ?? 0)" - self.followersCountLabel.text = "\(account.followerCount ?? 0)" + self.postsCountLabel.text = "\(account.feedCount )" + self.followingCountLabel.text = "\(account.followingCount)" + self.followersCountLabel.text = "\(account.followerCount)" followButton.setTitle("Edit", for: UIControl.State.normal) followButton.addTarget(self, action: #selector(self.tappedEditButton), for: UIControl.Event.touchUpInside) diff --git a/Example/Cactacea/ProfileHeaderReusableView.swift b/Example/Cactacea/ProfileHeaderReusableView.swift index beb8ba6..e368a99 100644 --- a/Example/Cactacea/ProfileHeaderReusableView.swift +++ b/Example/Cactacea/ProfileHeaderReusableView.swift @@ -38,7 +38,7 @@ class ProfileHeaderReusableView: UICollectionReusableView { profileImage.af_setImage(withURLRequest: urlRequest, imageTransition: .crossDissolve(0.2)) } - self.postsCountLabel.text = "\(account.feedsCount)" + self.postsCountLabel.text = "\(account.feedCount)" self.followingCountLabel.text = "\(account.followingCount)" self.followersCountLabel.text = "\(account.followerCount)" diff --git a/Example/Cactacea/ProfileViewController.swift b/Example/Cactacea/ProfileViewController.swift index cf5a408..8a03a31 100644 --- a/Example/Cactacea/ProfileViewController.swift +++ b/Example/Cactacea/ProfileViewController.swift @@ -32,7 +32,7 @@ class ProfileViewController: UIViewController { func fetchUser() { if let account = self.account { self.navigationItem.title = account.accountName - AccountsAPI.findDetail(id: account.id) { [weak self] (result, _) in + AccountsAPI.find(id: account.id) { [weak self] (result, _) in guard let weakSelf = self else { return } guard let account = result else { return } weakSelf.account = account