Make sure isFriendRequest is always true for OWSFriendRequestMessages

SignalServiceKit/src/Loki/Messages/OWSFriendRequestMessage.m

@@ -5,6 +5,8 @@
 
 @implementation OWSFriendRequestMessage
 
+-(BOOL)isFriendRequest { return YES; }
+
 - (SSKProtoContentBuilder *)contentBuilder:(SignalRecipient *)recipient {
     SSKProtoContentBuilder *contentBuilder = [super contentBuilder:recipient];
     

SignalServiceKit/src/Messages/OWSMessageSender.m

@@ -1111,7 +1111,6 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
     NSInteger *messageType = ((NSNumber *)signalMessage[@"type"]).integerValue;
     if (messageType == TSFriendRequestMessageType) {
         [message.thread setFriendRequestStatus:TSThreadFriendRequestStatusRequestSending withTransaction:nil];
-        [message setIsFriendRequest:YES withTransaction:nil];
     }
     BOOL isPoWRequired = YES; // TODO: Base on message type
     [[LokiAPI objc_sendSignalMessage:signalMessage to:recipient.recipientId timestamp:message.timestamp requiringPoW:isPoWRequired]