Merge bc2ce3915b into 2189ff3b66

tweak/Apollo.h

@@ -77,6 +77,7 @@
 
 @interface MarkdownRenderer
 + (id)attributedStringFromMarkdown:(id)arg1 withAttributes:(id)arg2;
++ (id)attributedStringFromMarkdown:(id)arg1 withAttributes:(id)arg2 isForPreview:(BOOL)arg3;
 @end
 
 @interface ActionController

tweak/Apollo.xm

@@ -318,7 +318,12 @@ id apolloCommentsControllerForContext;
 	NSAttributedString *newAuthorAttributedString = [[NSAttributedString alloc] initWithString:author attributes:authorStringAttributes];
 
 	[authorNode setAttributedTitle:newAuthorAttributedString forState:UIControlStateNormal];
-	[bodyNode setAttributedString:[%c(MarkdownRenderer) attributedStringFromMarkdown:body withAttributes:apolloBodyAttributes]];
+	@try {
+		[bodyNode setAttributedString:[%c(MarkdownRenderer) attributedStringFromMarkdown:body withAttributes:apolloBodyAttributes]];
+	}
+	@catch (NSException *exc) {
+		[bodyNode setAttributedString:[%c(MarkdownRenderer) attributedStringFromMarkdown:body withAttributes:apolloBodyAttributes isForPreview:NO]];
+	}
 
 	if ([data objectForKey:@"sender"]) {
 		[data[@"sender"] setEnabled:YES];
@@ -377,7 +382,12 @@ id apolloCommentsControllerForContext;
 	NSAttributedString* newAuthorAttributedString = [[NSAttributedString alloc] initWithString:authorTextString attributes:authorStringAttributes];
 
 	[authorNode setAttributedTitle:newAuthorAttributedString forState:UIControlStateNormal];
-	[bodyNode setAttributedString:[%c(MarkdownRenderer) attributedStringFromMarkdown:body withAttributes:apolloBodyAttributes]];
+	@try {
+		[bodyNode setAttributedString:[%c(MarkdownRenderer) attributedStringFromMarkdown:body withAttributes:apolloBodyAttributes]];
+	}
+	@catch (NSException *exc) {
+		[bodyNode setAttributedString:[%c(MarkdownRenderer) attributedStringFromMarkdown:body withAttributes:apolloBodyAttributes isForPreview:NO]];
+	}
 }
 
 %end