feat: friend block list

zapcannon87 · zapcannon87 · commit f9c32a735b2f · 2022-04-11T19:47:52.000+08:00
diff --git a/AVOS/Sources/Foundation/Query/LCQuery.m b/AVOS/Sources/Foundation/Query/LCQuery.m
@@ -1003,7 +1003,11 @@ + (void)clearAllCachedResults
 
 #pragma mark - Handle the data for communication with server
 - (NSString *)queryPath {
-    return [LCObjectUtils objectPath:self.className objectId:nil];
+    if (self.endpoint) {
+        return self.endpoint;
+    } else {
+        return [LCObjectUtils objectPath:self.className objectId:nil];
+    }
 }
 
 + (NSDictionary *)dictionaryFromIncludeKeys:(NSArray *)array {
diff --git a/AVOS/Sources/Foundation/Query/LCQuery_Internal.h b/AVOS/Sources/Foundation/Query/LCQuery_Internal.h
@@ -13,6 +13,7 @@
 @property (nonatomic, readwrite, strong) NSMutableDictionary *where;
 @property (nonatomic) NSMutableSet<NSString *> *selectedKeys;
 @property (nonatomic, strong) NSMutableDictionary *extraParameters;
+@property (nonatomic) NSString *endpoint;
 
 - (NSMutableDictionary *)assembleParameters;
 + (NSDictionary *)dictionaryFromIncludeKeys:(NSArray *)array;
diff --git a/AVOS/Sources/Foundation/User/LCFriendship.h b/AVOS/Sources/Foundation/User/LCFriendship.h
@@ -61,6 +61,18 @@ NS_ASSUME_NONNULL_BEGIN
 + (void)declineRequest:(LCFriendshipRequest *)request
               callback:(void (^)(BOOL succeeded, NSError * _Nullable error))callback;
 
+/// Block a friend by user id.
+/// @param userId The `objectId` of the user.
+/// @param callback Result callback.
++ (void)blockFriendWithUserId:(NSString *)userId
+                     callback:(void (^)(BOOL succeeded, NSError * _Nullable error))callback;
+
+/// Unblock a friend by user id.
+/// @param userId The `objectId` of the user.
+/// @param callback Result callback.
++ (void)unblockFriendWithUserId:(NSString *)userId
+                       callback:(void (^)(BOOL succeeded, NSError * _Nullable error))callback;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/AVOS/Sources/Foundation/User/LCFriendship.m b/AVOS/Sources/Foundation/User/LCFriendship.m
@@ -42,31 +42,25 @@ + (void)requestWithUserId:(NSString *)userId callback:(void (^)(BOOL, NSError *
 + (void)requestWithUserId:(NSString *)userId attributes:(NSDictionary *)attributes callback:(void (^)(BOOL, NSError * _Nullable))callback {
     if (!userId) {
         NSError *error = LCError(LCErrorInternalErrorCodeInconsistency, @"Parameter `userId` invalid.", nil);
-        dispatch_async(dispatch_get_main_queue(), ^{
-            callback(false, error);
-        });
+        [LCUtils callBooleanResultBlock:callback error:error];
         return;
     }
     LCUser *currentUser = [LCUser currentUser];
     if (!currentUser.sessionToken) {
         NSError *error = LCError(LCErrorInternalErrorCodeInconsistency, @"Please signin an user.", nil);
-        dispatch_async(dispatch_get_main_queue(), ^{
-            callback(false, error);
-        });
+        [LCUtils callBooleanResultBlock:callback error:error];
         return;
     }
     NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
     parameters[@"user"] = [LCObjectUtils dictionaryFromObjectPointer:currentUser];
     parameters[@"friend"] = [LCObjectUtils dictionaryFromObjectPointer:[LCUser objectWithObjectId:userId]];
-    if (attributes) {
+    if (attributes && attributes.count > 0) {
         parameters[@"friendship"] = attributes;
     }
     [[LCPaasClient sharedInstance] postObject:@"users/friendshipRequests"
                                withParameters:parameters
                                         block:^(id  _Nullable object, NSError * _Nullable error) {
-        dispatch_async(dispatch_get_main_queue(), ^{
-            callback(!error, error);
-        });
+        [LCUtils callBooleanResultBlock:callback error:error];
     }];
 }
 
@@ -75,61 +69,79 @@ + (void)acceptRequest:(LCFriendshipRequest *)request callback:(void (^)(BOOL, NS
 }
 
 + (void)acceptRequest:(LCFriendshipRequest *)request attributes:(NSDictionary *)attributes callback:(void (^)(BOOL, NSError * _Nullable))callback {
+    [self acceptOrDeclineRequest:request operation:@"accept" attributes:attributes callback:callback];
+}
+
++ (void)declineRequest:(LCFriendshipRequest *)request callback:(void (^)(BOOL, NSError * _Nullable))callback {
+    [self acceptOrDeclineRequest:request operation:@"decline" attributes:nil callback:callback];
+}
+
++ (void)acceptOrDeclineRequest:(LCFriendshipRequest *)request
+                     operation:(NSString *)operation
+                    attributes:(NSDictionary *)attributes
+                      callback:(void (^)(BOOL, NSError * _Nullable))callback
+{
     if (!request.objectId) {
         NSError *error = LCError(LCErrorInternalErrorCodeInconsistency, @"Parameter `request` invalid.", nil);
-        dispatch_async(dispatch_get_main_queue(), ^{
-            callback(false, error);
-        });
+        [LCUtils callBooleanResultBlock:callback error:error];
         return;
     }
     LCUser *currentUser = [LCUser currentUser];
     if (!currentUser.sessionToken) {
         NSError *error = LCError(LCErrorInternalErrorCodeInconsistency, @"Please signin an user.", nil);
-        dispatch_async(dispatch_get_main_queue(), ^{
-            callback(false, error);
-        });
+        [LCUtils callBooleanResultBlock:callback error:error];
         return;
     }
-    NSString *path = [NSString stringWithFormat:@"users/friendshipRequests/%@/accept", request.objectId];
+    NSString *path = [NSString stringWithFormat:@"users/friendshipRequests/%@/%@", request.objectId, operation];
     NSDictionary *parameters;
-    if (attributes) {
+    if (attributes && attributes.count > 0) {
         parameters = @{ @"friendship" : attributes };
     }
     [[LCPaasClient sharedInstance] putObject:path
                               withParameters:parameters
                                 sessionToken:currentUser.sessionToken
                                        block:^(id  _Nullable object, NSError * _Nullable error) {
-        dispatch_async(dispatch_get_main_queue(), ^{
-            callback(!error, error);
-        });
+        [LCUtils callBooleanResultBlock:callback error:error];
     }];
 }
 
-+ (void)declineRequest:(LCFriendshipRequest *)request callback:(void (^)(BOOL, NSError * _Nullable))callback {
-    if (!request.objectId) {
-        NSError *error = LCError(LCErrorInternalErrorCodeInconsistency, @"Parameter `request` invalid.", nil);
-        dispatch_async(dispatch_get_main_queue(), ^{
-            callback(false, error);
-        });
++ (void)blockFriendWithUserId:(NSString *)userId callback:(void (^)(BOOL, NSError * _Nullable))callback {
+    [self blockOrUnblockFriendWithUserId:userId isBlock:true callback:callback];
+}
+
++ (void)unblockFriendWithUserId:(NSString *)userId callback:(void (^)(BOOL, NSError * _Nullable))callback {
+    [self blockOrUnblockFriendWithUserId:userId isBlock:false callback:callback];
+}
+
++ (void)blockOrUnblockFriendWithUserId:(NSString *)userId
+                               isBlock:(BOOL)isBlock
+                              callback:(void (^)(BOOL, NSError * _Nullable))callback
+{
+    if (!userId) {
+        NSError *error = LCError(LCErrorInternalErrorCodeInconsistency, @"Parameter `userId` invalid.", nil);
+        [LCUtils callBooleanResultBlock:callback error:error];
         return;
     }
     LCUser *currentUser = [LCUser currentUser];
     if (!currentUser.sessionToken) {
         NSError *error = LCError(LCErrorInternalErrorCodeInconsistency, @"Please signin an user.", nil);
-        dispatch_async(dispatch_get_main_queue(), ^{
-            callback(false, error);
-        });
+        [LCUtils callBooleanResultBlock:callback error:error];
         return;
     }
-    NSString *path = [NSString stringWithFormat:@"users/friendshipRequests/%@/decline", request.objectId];
-    [[LCPaasClient sharedInstance] putObject:path
-                              withParameters:nil
-                                sessionToken:currentUser.sessionToken
-                                       block:^(id  _Nullable object, NSError * _Nullable error) {
-        dispatch_async(dispatch_get_main_queue(), ^{
-            callback(!error, error);
-        });
-    }];
+    NSString *path = [NSString stringWithFormat:@"users/self/friendBlocklist/%@", userId];
+    if (isBlock) {
+        [[LCPaasClient sharedInstance] postObject:path
+                                   withParameters:nil
+                                            block:^(id  _Nullable object, NSError * _Nullable error) {
+            [LCUtils callBooleanResultBlock:callback error:error];
+        }];
+    } else {
+        [[LCPaasClient sharedInstance] deleteObject:path
+                                     withParameters:nil
+                                              block:^(id  _Nullable object, NSError * _Nullable error) {
+            [LCUtils callBooleanResultBlock:callback error:error];
+        }];
+    }
 }
 
 @end
diff --git a/AVOS/Sources/Foundation/User/LCUser.h b/AVOS/Sources/Foundation/User/LCUser.h
@@ -553,6 +553,12 @@ FOUNDATION_EXPORT LeanCloudSocialPlatform const LeanCloudSocialPlatformWeiXin;
 /// New query for followee objects.
 - (LCQuery *)followeeObjectsQuery;
 
+/// New query for friend list.
+- (LCQuery *)friendshipQuery;
+
+/// New query for block list.
+- (LCQuery *)friendshipBlockQuery;
+
 /**
  *  通过ID来关注其他用户
  *  @warning 如果需要被关注者收到消息 需要手动给他发送一条LCStatus.
diff --git a/AVOS/Sources/Foundation/User/LCUser.m b/AVOS/Sources/Foundation/User/LCUser.m
@@ -1345,6 +1345,18 @@ - (LCQuery *)followeeObjectsQuery {
     return query;
 }
 
+- (LCQuery *)friendshipQuery {
+    LCQuery *query = [LCQuery queryWithClassName:@"_Followee"];
+    query.endpoint = @"users/self/friends";
+    return query;
+}
+
+- (LCQuery *)friendshipBlockQuery {
+    LCQuery *query = [LCQuery queryWithClassName:@"_Blocklist"];
+    query.endpoint = @"users/self/friendBlocklist";
+    return query;
+}
+
 - (void)follow:(NSString *)userId andCallback:(LCBooleanResultBlock)callback {
     [self follow:userId userDictionary:nil andCallback:callback];
 }
