Inline method with one caller, fix formatting

// FREEBIE

Signal/src/ViewControllers/DebugUI/DebugUIMessages.m

@@ -3599,11 +3599,12 @@ isQuotedMessageAttachmentDownloaded:(BOOL)isQuotedMessageAttachmentDownloaded
         NSString *text = [self randomText];
         OWSDisappearingMessagesConfiguration *configuration =
             [OWSDisappearingMessagesConfiguration fetchObjectWithUniqueID:thread.uniqueId transaction:transaction];
-        TSOutgoingMessage *message =
+
-            [TSOutgoingMessage outgoingMessageInThread:thread
+        uint32_t expiresInSeconds = (configuration.isEnabled ? configuration.durationSeconds : 0);
-                                           messageBody:text
+        TSOutgoingMessage *message = [TSOutgoingMessage outgoingMessageInThread:thread
-                                          attachmentId:nil
+                                                                    messageBody:text
-                                      expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)];
+                                                                   attachmentId:nil
+                                                               expiresInSeconds:expiresInSeconds];
         DDLogError(@"%@ insertAndDeleteNewOutgoingMessages timestamp: %llu.", self.logTag, message.timestamp);
         [messages addObject:message];
     }
@@ -3628,11 +3629,12 @@ isQuotedMessageAttachmentDownloaded:(BOOL)isQuotedMessageAttachmentDownloaded
         OWSDisappearingMessagesConfiguration *configuration =
             [OWSDisappearingMessagesConfiguration fetchObjectWithUniqueID:thread.uniqueId
                                                               transaction:initialTransaction];
-        TSOutgoingMessage *message =
+
-            [TSOutgoingMessage outgoingMessageInThread:thread
+        uint32_t expiresInSeconds = (configuration.isEnabled ? configuration.durationSeconds : 0);
-                                           messageBody:text
+        TSOutgoingMessage *message = [TSOutgoingMessage outgoingMessageInThread:thread
-                                          attachmentId:nil
+                                                                    messageBody:text
-                                      expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)];
+                                                                   attachmentId:nil
+                                                               expiresInSeconds:expiresInSeconds];
         DDLogError(@"%@ resurrectNewOutgoingMessages1 timestamp: %llu.", self.logTag, message.timestamp);
         [messages addObject:message];
     }

SignalMessaging/Models/OWSQuotedReplyModel.m

@@ -50,8 +50,6 @@
     _thumbnailImage = thumbnailImage;
     _contentType = contentType;
     _sourceFilename = sourceFilename;
-
-    // rename to originalAttachmentStream?
     _attachmentStream = attachmentStream;
 
     return self;
@@ -101,6 +99,7 @@
     OWSAssert(transaction);
 
     TSThread *thread = [message threadWithTransaction:transaction];
+    OWSAssert(thread);
 
     NSString *_Nullable authorId = ^{
         if ([message isKindOfClass:[TSOutgoingMessage class]]) {
@@ -114,19 +113,6 @@
     }();
     OWSAssert(authorId.length > 0);
 
-    return [self quotedReplyForMessage:message authorId:authorId thread:thread transaction:transaction];
-}
-
-+ (nullable OWSQuotedReplyModel *)quotedReplyForMessage:(TSMessage *)message
-                                               authorId:(NSString *)authorId
-                                                 thread:(TSThread *)thread
-                                            transaction:(YapDatabaseReadTransaction *)transaction
-{
-    OWSAssert(message);
-    OWSAssert(authorId.length > 0);
-    OWSAssert(thread);
-    OWSAssert(transaction);
-
     uint64_t timestamp = message.timestamp;
     NSString *_Nullable quotedText = message.body;
     BOOL hasText = quotedText.length > 0;

SignalMessaging/utils/ThreadUtil.m

@@ -129,15 +129,17 @@ NS_ASSUME_NONNULL_BEGIN
     OWSDisappearingMessagesConfiguration *configuration =
         [OWSDisappearingMessagesConfiguration fetchObjectWithUniqueID:thread.uniqueId];
 
-    TSOutgoingMessage *message = [[TSOutgoingMessage alloc]
+    uint32_t expiresInSeconds = (configuration.isEnabled ? configuration.durationSeconds : 0);
-        initOutgoingMessageWithTimestamp:[NSDate ows_millisecondTimeStamp]
+    TSOutgoingMessage *message =
-                                inThread:thread
+        [[TSOutgoingMessage alloc] initOutgoingMessageWithTimestamp:[NSDate ows_millisecondTimeStamp]
-                             messageBody:attachment.captionText
+                                                           inThread:thread
-                           attachmentIds:[NSMutableArray new]
+                                                        messageBody:attachment.captionText
-                        expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)expireStartedAt:0
+                                                      attachmentIds:[NSMutableArray new]
-                          isVoiceMessage:[attachment isVoiceMessage]
+                                                   expiresInSeconds:expiresInSeconds
-                        groupMetaMessage:TSGroupMessageNone
+                                                    expireStartedAt:0
-                           quotedMessage:[quotedReplyModel buildQuotedMessage]];
+                                                     isVoiceMessage:[attachment isVoiceMessage]
+                                                   groupMetaMessage:TSGroupMessageNone
+                                                      quotedMessage:[quotedReplyModel buildQuotedMessage]];
 
     [messageSender enqueueAttachment:attachment.dataSource
         contentType:attachment.mimeType

SignalServiceKit/src/Messages/Attachments/OWSAttachmentsProcessor.h

@@ -29,7 +29,6 @@ extern NSString *const kAttachmentDownloadAttachmentIDKey;
 
 - (instancetype)init NS_UNAVAILABLE;
 
-// TODO make this take one and loop over?
 - (instancetype)initWithAttachmentProtos:(NSArray<OWSSignalServiceProtosAttachmentPointer *> *)attachmentProtos
                                    relay:(nullable NSString *)relay
                           networkManager:(TSNetworkManager *)networkManager

SignalServiceKit/src/Messages/Interactions/TSInteraction.h

@@ -42,6 +42,7 @@ typedef NS_ENUM(NSInteger, OWSInteractionType) {
 + (NSArray<TSInteraction *> *)interactionsWithTimestamp:(uint64_t)timestamp
                                                 ofClass:(Class)clazz
                                         withTransaction:(YapDatabaseReadWriteTransaction *)transaction;
+
 + (NSArray<TSInteraction *> *)interactionsWithTimestamp:(uint64_t)timestamp
                                                  filter:(BOOL (^_Nonnull)(TSInteraction *))filter
                                         withTransaction:(YapDatabaseReadWriteTransaction *)transaction;