From d6b5fd0d01f8c60892a633a856955015b50ec4f8 Mon Sep 17 00:00:00 2001
From: lint <47455468+lint@users.noreply.github.com>
Date: Wed, 10 Feb 2021 15:30:10 -0500
Subject: [PATCH] Slightly improve error message

---
 tweak/assets/TFHelper.m | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/tweak/assets/TFHelper.m b/tweak/assets/TFHelper.m
index 5074911..17ad962 100644
--- a/tweak/assets/TFHelper.m
+++ b/tweak/assets/TFHelper.m
@@ -22,9 +22,10 @@
 
 		NSString *author = @"[author]";
 		NSString *body = @"[body]";
+		NSError *jsonError;
 
 		if (data) {
-			id jsonData = [[NSJSONSerialization JSONObjectWithData:data options:0 error:&error] objectForKey:@"data"];
+			id jsonData = [[NSJSONSerialization JSONObjectWithData:data options:0 error:&jsonError] objectForKey:@"data"];
 			if (jsonData && [jsonData count] != 0) {
 				author = [jsonData[0] objectForKey:@"author"];
 				body = isComment ? [jsonData[0] objectForKey:@"body"] : [jsonData[0] objectForKey:@"selftext"];
@@ -36,9 +37,16 @@
 			}
 		}
 
+		if (error || jsonError) {
+			body = [NSString stringWithFormat:@"[an error occurred while attempting retrieve data from the pushshift api]\n\nHTTP Status Code: %li", (long)((NSHTTPURLResponse *)response).statusCode];
+		}
+
 		if (error) {
-			body = [NSString stringWithFormat:@"[an error occurred while attempting retrieve data from the pushshift api]\n\nHTTP Status Code: %li\n\nError Description: %@",
-			(long)((NSHTTPURLResponse *)response).statusCode, [error localizedDescription]];
+			body = [body stringByAppendingFormat:@"\n\nRequest Error: %@", [error localizedDescription]];
+		}
+
+		if (jsonError) {
+			body = [body stringByAppendingFormat:@"\n\nJSON Error: %@", [jsonError localizedDescription]];
 		}
 
 		NSMutableDictionary *result = [NSMutableDictionary dictionaryWithDictionary:@{@"author" : author, @"body" : body}];