From 8a9151368098feb303252a811761109c5c08086d Mon Sep 17 00:00:00 2001
From: lint <47455468+lint@users.noreply.github.com>
Date: Thu, 10 Oct 2019 14:52:23 -0400
Subject: [PATCH] Fix Apollo bug, add prefs, update Narwhal menu

---
 Makefile                        |   6 +-
 control                         |   2 +-
 prefs/Makefile                  |  17 +++
 prefs/Resources/Info.plist      |  24 +++++
 prefs/Resources/Root.plist      |  29 ++++++
 prefs/Resources/icon.png        | Bin 0 -> 3249 bytes
 prefs/Resources/icon@2x.png     | Bin 0 -> 3791 bytes
 prefs/Resources/icon@3x.png     | Bin 0 -> 4349 bytes
 prefs/TFDTSRootListController.h |   5 +
 prefs/TFDTSRootListController.m |  13 +++
 prefs/entry.plist               |  21 ++++
 tfdidthatsay.plist              | Bin 172 -> 148 bytes
 tweak/Apollo.h                  |   5 +-
 tweak/Apollo.xm                 |  75 +++++++++-----
 tweak/Narwhal.xm                | 177 ++++++++++----------------------
 15 files changed, 219 insertions(+), 155 deletions(-)
 create mode 100644 prefs/Makefile
 create mode 100644 prefs/Resources/Info.plist
 create mode 100644 prefs/Resources/Root.plist
 create mode 100644 prefs/Resources/icon.png
 create mode 100644 prefs/Resources/icon@2x.png
 create mode 100644 prefs/Resources/icon@3x.png
 create mode 100644 prefs/TFDTSRootListController.h
 create mode 100644 prefs/TFDTSRootListController.m
 create mode 100644 prefs/entry.plist

diff --git a/Makefile b/Makefile
index df0db51..19b277b 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,11 @@ tweak/Narwhal.xm_CFLAGS = -fobjc-arc
 
 include $(THEOS_MAKE_PATH)/tweak.mk
 
+SUBPROJECTS += prefs
+include $(THEOS_MAKE_PATH)/aggregate.mk
+
+
 after-install::
 	install.exec "killall -9 Reddit"
 	install.exec "killall -9 Apollo"
-	install.exec "killall -9 narwhal"
\ No newline at end of file
+	install.exec "killall -9 narwhal"
diff --git a/control b/control
index ec98a2c..0d89210 100644
--- a/control
+++ b/control
@@ -1,7 +1,7 @@
 Package: com.lint.undelete
 Name: TFDidThatSay?
 Depends: mobilesubstrate
-Version: 1.2.2
+Version: 1.2.3
 Architecture: iphoneos-arm
 Description: See "[deleted]" comments and posts without leaving Reddit!
 Maintainer: lint <apieceoflint@protonmail.com>
diff --git a/prefs/Makefile b/prefs/Makefile
new file mode 100644
index 0000000..a94143a
--- /dev/null
+++ b/prefs/Makefile
@@ -0,0 +1,17 @@
+include $(THEOS)/makefiles/common.mk
+
+ARCHS = arm64 arm64e
+
+BUNDLE_NAME = TFDidThatSayPrefs
+
+TFDidThatSayPrefs_FILES = TFDTSRootListController.m
+TFDidThatSayPrefs_INSTALL_PATH = /Library/PreferenceBundles
+TFDidThatSayPrefs_FRAMEWORKS = UIKit
+TFDidThatSayPrefs_PRIVATE_FRAMEWORKS = Preferences
+TFDidThatSayPrefs_CFLAGS = -fobjc-arc
+
+include $(THEOS_MAKE_PATH)/bundle.mk
+
+internal-stage::
+	$(ECHO_NOTHING)mkdir -p $(THEOS_STAGING_DIR)/Library/PreferenceLoader/Preferences$(ECHO_END)
+	$(ECHO_NOTHING)cp entry.plist $(THEOS_STAGING_DIR)/Library/PreferenceLoader/Preferences/TFDidThatSayPrefs.plist$(ECHO_END)
diff --git a/prefs/Resources/Info.plist b/prefs/Resources/Info.plist
new file mode 100644
index 0000000..3553794
--- /dev/null
+++ b/prefs/Resources/Info.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>TFDidThatSayPrefs</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.lint.undelete.prefs</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>NSPrincipalClass</key>
+	<string>TFDTSRootListController</string>
+</dict>
+</plist>
diff --git a/prefs/Resources/Root.plist b/prefs/Resources/Root.plist
new file mode 100644
index 0000000..c39d9d3
--- /dev/null
+++ b/prefs/Resources/Root.plist
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>items</key>
+	<array>
+		<dict>
+			<key>cell</key>
+			<string>PSGroupCell</string>
+			<key>label</key>
+			<string>Apollo </string>
+		</dict>
+		<dict>
+			<key>cell</key>
+			<string>PSSwitchCell</string>
+			<key>default</key>
+			<true/>
+			<key>defaults</key>
+			<string>com.lint.undelete.prefs</string>
+			<key>key</key>
+			<string>isApolloDeletedCommentsOnly</string>
+			<key>label</key>
+			<string>Only display eye on deleted comments</string>
+		</dict>
+	</array>
+	<key>title</key>
+	<string>TFDidThatSay?</string>
+</dict>
+</plist>
diff --git a/prefs/Resources/icon.png b/prefs/Resources/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bc919e806bcd8933269a47143bba3b8d0040a1d
GIT binary patch
literal 3249
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

literal 0
HcmV?d00001

diff --git a/prefs/Resources/icon@2x.png b/prefs/Resources/icon@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f44fc1789cb9572b3ca5ba88a32962876d6d77dc
GIT binary patch
literal 3791
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
FV1g(uC+z?L

literal 0
HcmV?d00001

diff --git a/prefs/Resources/icon@3x.png b/prefs/Resources/icon@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..95dd6eabc73f0ac9e299bbc5b5c6865be90d41d0
GIT binary patch
literal 4349
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

literal 0
HcmV?d00001

diff --git a/prefs/TFDTSRootListController.h b/prefs/TFDTSRootListController.h
new file mode 100644
index 0000000..e96e2b1
--- /dev/null
+++ b/prefs/TFDTSRootListController.h
@@ -0,0 +1,5 @@
+#import <Preferences/PSListController.h>
+
+@interface TFDTSRootListController : PSListController
+
+@end
diff --git a/prefs/TFDTSRootListController.m b/prefs/TFDTSRootListController.m
new file mode 100644
index 0000000..bf34ad2
--- /dev/null
+++ b/prefs/TFDTSRootListController.m
@@ -0,0 +1,13 @@
+#include "TFDTSRootListController.h"
+
+@implementation TFDTSRootListController
+
+- (NSArray *)specifiers {
+	if (!_specifiers) {
+		_specifiers = [self loadSpecifiersFromPlistName:@"Root" target:self];
+	}
+
+	return _specifiers;
+}
+
+@end
diff --git a/prefs/entry.plist b/prefs/entry.plist
new file mode 100644
index 0000000..374fa63
--- /dev/null
+++ b/prefs/entry.plist
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>entry</key>
+	<dict>
+		<key>bundle</key>
+		<string>TFDidThatSayPrefs</string>
+		<key>cell</key>
+		<string>PSLinkCell</string>
+		<key>detail</key>
+		<string>TFDTSRootListController</string>
+		<key>icon</key>
+		<string>icon.png</string>
+		<key>isController</key>
+		<true/>
+		<key>label</key>
+		<string>TFDidThatSay?</string>
+	</dict>
+</dict>
+</plist>
diff --git a/tfdidthatsay.plist b/tfdidthatsay.plist
index 344fea02ebae7845043cd8d6614588a07ea383b8..99887e38f1be30982bae5412f325b47ae5d51065 100644
GIT binary patch
delta 112
zcmZ3(IEB$7sURn_xWvHVA|q3nTV_s4YSBezmT;%iyp){O;>E0N?C}DE$@#f@MX4z%
tnI(EbU@Bffa$>wBbG(4W#Ci!04sIb)Sw+)81~6b`gwPBeP#Q+%001ei7<>Q#

literal 172
zcmb>CQUC(C%$$<cA_ZFzTcH{(1Y$Xr=B4DM7DL5BA{uZx5Kk#NKUc3PH6<mpL@x+T
zDd}J;NX{tAEH24R%qvdK$xPRCEXdEv$p<Rr<m7}HkeQsFkyr#&l%J=UmsnJuk(i?d
OH%8MM%&fKMss#WH|0~%5

diff --git a/tweak/Apollo.h b/tweak/Apollo.h
index 301d6cf..b541b06 100644
--- a/tweak/Apollo.h
+++ b/tweak/Apollo.h
@@ -16,8 +16,7 @@
 -(void) calculatedLayoutDidChange;
 
 //custom element
-@property(assign,nonatomic) id undeleteButton;
-
+@property(strong,nonatomic) id undeleteButton;
 @end
 
 /* -- Post Interfaces -- */
@@ -31,7 +30,7 @@
 @end
 
 @interface ApolloCommentsHeaderCellNode
-@property(assign, nonatomic) id undeleteButton;
+@property(strong, nonatomic) id undeleteButton;
 @end
 
 /* -- Other Interfaces -- */
diff --git a/tweak/Apollo.xm b/tweak/Apollo.xm
index 726c4bd..b953be2 100644
--- a/tweak/Apollo.xm
+++ b/tweak/Apollo.xm
@@ -3,18 +3,22 @@
 
 %group Apollo
 
-%hook ApolloApolloButtonNode
-%end
-
+const NSDictionary* settings = [[NSDictionary alloc] initWithContentsOfFile:@"/var/mobile/Library/Preferences/com.lint.undelete.prefs.plist"];
 
 NSDictionary* apolloBodyAttributes = nil;
 
+%hook ApolloApolloButtonNode
+%end
 
 %hook RKComment
 
 -(BOOL) isDeleted{
 	return NO;
 }
+
+-(BOOL) isModeratorRemoved{
+	return NO;
+}
 %end
 
 
@@ -30,10 +34,12 @@ NSDictionary* apolloBodyAttributes = nil;
 
 
 %hook ApolloCommentCellNode
-%property(assign,nonatomic) id undeleteButton;
+%property(strong,nonatomic) id undeleteButton;
 
 %new
--(void) didTapUndeleteButton{
+-(void) didTapUndeleteButton:(id) sender{
+	
+	[sender setEnabled:NO];
 
 	id bodyNode = MSHookIvar<id>(self, "bodyNode");
 	id authorNode = MSHookIvar<id>(self, "authorNode");
@@ -77,48 +83,64 @@ NSDictionary* apolloBodyAttributes = nil;
 		
 		[bodyNode setAttributedString:[%c(MarkdownRenderer) attributedStringFromMarkdown:body withAttributes:apolloBodyAttributes]];
 		
+		[sender setEnabled:YES];
+		
 	}];
 }
 
 -(void) didLoad {
 	%orig;
 	
-	CGFloat imageSize = 20.0f;
-
-	UIButton *undeleteButton = [UIButton buttonWithType:UIButtonTypeCustom];
-	[undeleteButton addTarget:self action:@selector(didTapUndeleteButton) forControlEvents:UIControlEventTouchUpInside];
-	undeleteButton.frame = CGRectMake(0, 0, imageSize, imageSize);
+	id commentBody = [MSHookIvar<id>(self, "comment") body];
 	
-	UIImage* undeleteImage = [UIImage imageWithContentsOfFile:@"/var/mobile/Library/Application Support/TFDidThatSay/eye160dark.png"];
-	[undeleteButton setImage:undeleteImage forState:UIControlStateNormal];
+	id isDeletedOnly = [settings valueForKey:@"isApolloDeletedCommentsOnly"];
+	
+	if (([isDeletedOnly isEqual:@1] && ([commentBody isEqualToString:@"[deleted]"] || [commentBody isEqualToString:@"[removed]"])) || [isDeletedOnly isEqual:@0] ) {
+	
+		CGFloat imageSize = 20.0f;
 
-	[[self view] addSubview:undeleteButton];
-	[self setUndeleteButton:undeleteButton];
+		UIButton *undeleteButton = [UIButton buttonWithType:UIButtonTypeCustom];
+		[undeleteButton addTarget:self action:@selector(didTapUndeleteButton:) forControlEvents:UIControlEventTouchUpInside];
+		undeleteButton.frame = CGRectMake(0, 0, imageSize, imageSize);
+		
+		UIImage* undeleteImage = [UIImage imageWithContentsOfFile:@"/var/mobile/Library/Application Support/TFDidThatSay/eye160dark.png"];
+		[undeleteButton setImage:undeleteImage forState:UIControlStateNormal];
+
+		[[self view] addSubview:undeleteButton];
+		[self setUndeleteButton:undeleteButton];
+	
+	}
 }
 
 -(void) _layoutSublayouts{
 	%orig;
 	
-	CGFloat imageSize = 20.0f;
+	if ([self undeleteButton]){
+	
+		CGFloat imageSize = 20.0f;
 
-	id moreNode = MSHookIvar<id>(self, "moreOptionsNode");
-	id ageNode = MSHookIvar<id>(self, "ageNode");
+		id moreNode = MSHookIvar<id>(self, "moreOptionsNode");
+		id ageNode = MSHookIvar<id>(self, "ageNode");
 
-	CGRect nodeFrame = [moreNode frame];
-	CGFloat centerHeight = (nodeFrame.size.height + nodeFrame.origin.y * 2) / 2.0f;
-	CGFloat nodeSpacing =[ageNode frame].origin.x - nodeFrame.origin.x - nodeFrame.size.width;
+		CGRect nodeFrame = [moreNode frame];
+		CGFloat centerHeight = (nodeFrame.size.height + nodeFrame.origin.y * 2) / 2.0f;
+		CGFloat nodeSpacing =[ageNode frame].origin.x - nodeFrame.origin.x - nodeFrame.size.width;
 
-	[[self undeleteButton] setFrame:CGRectMake(nodeFrame.origin.x - imageSize - nodeSpacing, centerHeight - (imageSize / 2), imageSize, imageSize)];
+		[[self undeleteButton] setFrame:CGRectMake(nodeFrame.origin.x - imageSize - nodeSpacing, centerHeight - (imageSize / 2), imageSize, imageSize)];
+		
+	}
 }
 
 %end
 
 
 %hook ApolloCommentsHeaderCellNode
-%property(assign, nonatomic) id undeleteButton;
+%property(strong, nonatomic) id undeleteButton;
 
 %new
--(void) didTapUndeleteButton{
+-(void) didTapUndeleteButton:(id) sender{
+	
+	[sender setEnabled:NO];
 
 	id bodyNode = MSHookIvar<id>(self, "bodyNode");
 	id postInfoNode = MSHookIvar<id>(self, "postInfoNode");
@@ -165,6 +187,8 @@ NSDictionary* apolloBodyAttributes = nil;
 		
 		[bodyNode setAttributedString:[%c(MarkdownRenderer) attributedStringFromMarkdown:body withAttributes:apolloBodyAttributes]];
 		
+		[sender setEnabled:YES];
+		
 	}];
 	
 }
@@ -177,7 +201,7 @@ NSDictionary* apolloBodyAttributes = nil;
 		CGFloat imageSize = 20.0f;
 
 		UIButton *undeleteButton = [UIButton buttonWithType:UIButtonTypeCustom];
-		[undeleteButton addTarget:self action:@selector(didTapUndeleteButton) forControlEvents:UIControlEventTouchUpInside];
+		[undeleteButton addTarget:self action:@selector(didTapUndeleteButton:) forControlEvents:UIControlEventTouchUpInside];
 		
 		UIImage* undeleteImage = [UIImage imageWithContentsOfFile:@"/var/mobile/Library/Application Support/TFDidThatSay/eye160dark.png"];
 		[undeleteButton setImage:undeleteImage forState:UIControlStateNormal];
@@ -201,7 +225,6 @@ NSDictionary* apolloBodyAttributes = nil;
 		CGFloat centerHeight = [postInfoNode frame].origin.y + ([ageNode frame].size.height + [ageNode frame].origin.y * 2) / 2.0f;
 		CGFloat buttonXPos = [postInfoNode frame].origin.x + [postInfoNode frame].size.width - imageSize;
 		
-		//Compiling with DEBUG=0 causes this to break the app, I have no idea why. 
 		[[self undeleteButton] setFrame:CGRectMake(buttonXPos, centerHeight - (imageSize / 2), imageSize, imageSize)];
 	}
 }
@@ -211,10 +234,10 @@ NSDictionary* apolloBodyAttributes = nil;
 
 
 %ctor {
+	
 	NSString* processName = [[NSProcessInfo processInfo] processName];
 	
 	if ([processName isEqualToString:@"Apollo"]){
 		%init(Apollo, ApolloCommentsHeaderCellNode = objc_getClass("Apollo.CommentsHeaderCellNode"), ApolloCommentCellNode = objc_getClass("Apollo.CommentCellNode"), ApolloApolloButtonNode = objc_getClass("Apollo.ApolloButtonNode"));
 	}
 }
-
diff --git a/tweak/Narwhal.xm b/tweak/Narwhal.xm
index dea2c66..6a3657a 100644
--- a/tweak/Narwhal.xm
+++ b/tweak/Narwhal.xm
@@ -3,52 +3,9 @@
 
 %group Narwhal
 
-UIAlertController* recreateActionSheet(id controller, id comment, NSInteger commentIndex){
-	
-	UIAlertController* alert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:nil];
-	
-	UIAlertAction* pmAction = [UIAlertAction actionWithTitle:[NSString stringWithFormat:@"private message %@", [comment author]] style:nil handler:^(UIAlertAction* action){[controller _handleActionSheetPrivateMessage:comment];}];
-	UIAlertAction* viewProfileAction = [UIAlertAction actionWithTitle:@"view profile" style:nil handler:^(UIAlertAction* action){[controller _handleActionSheetViewProfile:comment];}];
-	UIAlertAction* shareAction = [UIAlertAction actionWithTitle:@"share comment" style:nil handler:^(UIAlertAction* action){[controller _handleActionSheetShareComment:comment];}];
-	UIAlertAction* copyAction = [UIAlertAction actionWithTitle:@"copy text" style:nil handler:^(UIAlertAction* action){[controller _handleActionSheetCopyCommentText:comment];}];
-	UIAlertAction* reportAction = [UIAlertAction actionWithTitle:@"report comment" style:nil handler:^(UIAlertAction* action){[controller _handleActionSheetReportComment:comment];}];
-	UIAlertAction* cancelAction = [UIAlertAction actionWithTitle:@"cancel" style:UIAlertActionStyleCancel handler:nil];
-	
-	[alert addAction:pmAction];
-	[alert addAction:viewProfileAction];
-	[alert addAction:shareAction];
-	[alert addAction:copyAction];
-	
-	if ([comment isSaved]){
-		UIAlertAction* unsaveAction = [UIAlertAction actionWithTitle:@"unsave comment" style:nil handler:^(UIAlertAction* action){[controller _handleActionSheetUnsaveComment:comment index:commentIndex];}];
-		[alert addAction:unsaveAction];
-		
-	} else {
-		UIAlertAction* saveAction = [UIAlertAction actionWithTitle:@"save comment" style:nil handler:^(UIAlertAction* action){[controller _handleActionSheetSaveComment:comment index:commentIndex];}];
-		[alert addAction:saveAction];
-	}
-	
-	if ([[[comment parentID] componentsSeparatedByString:@"_"][0] isEqualToString:@"t1"]){
-		UIAlertAction* viewParentAction = [UIAlertAction actionWithTitle:@"view parent" style: nil handler:^(UIAlertAction* action){[controller _handleActionSheetViewParent:comment];}];
-		[alert addAction:viewParentAction];
-	}
-	
-	if ([[comment author] isEqualToString:[[%c(NRTAuthManager) sharedManager] currentUsername]]) {
-		UIAlertAction* editAction = [UIAlertAction actionWithTitle:@"edit comment" style:nil handler:^(UIAlertAction* action){[controller _handleActionSheetEditComment:comment];}];
-		UIAlertAction* deleteAction = [UIAlertAction actionWithTitle:@"delete comment" style:nil handler:^(UIAlertAction* action){[controller _handleActionSheetDeleteComment:comment];}];
-		
-		[alert addAction:editAction];
-		[alert addAction:deleteAction];
-	}
-	
-	[alert addAction:reportAction];
-	[alert addAction:cancelAction];
-		
-	UIAlertAction* undeleteAction = [UIAlertAction actionWithTitle:@"tf did that say?" style:nil handler:^(UIAlertAction* action){[controller handleUndeleteCommentAction:comment];}];
-	[alert addAction:undeleteAction];
-	
-	return alert;
-}
+BOOL shouldHaveUndeleteAction = NO;
+id tfComment;
+id tfController;
 
 void getUndeleteCommentData(id controller, id comment){
 	
@@ -71,12 +28,6 @@ void getUndeleteCommentData(id controller, id comment){
 				if ([body isEqualToString:@"[deleted]"] || [body isEqualToString:@"[removed]"]){
 					body = @"[pushshift was unable to archive this]";
 				}
-				if (!body){
-					body = @"[wtf]";
-				}
-				if (!author){
-					author = @"[wtf]";
-				}
 			} else {
 				body = @"[pushshift has not archived this yet]";
 			}
@@ -87,7 +38,34 @@ void getUndeleteCommentData(id controller, id comment){
 		[controller performSelectorOnMainThread:@selector(completeUndeleteComment:) withObject:@{@"body":body, @"author":author, @"comment":comment} waitUntilDone:NO];
 	}];
 	
-}
+}
+
+
+
+%hook UIViewController
+
+-(void) presentViewController:(id) arg1 animated:(BOOL) arg2 completion:(id) arg3{
+	
+	if ([arg1 isKindOfClass:[UIAlertController class]] && shouldHaveUndeleteAction){
+		
+		UIAlertAction* undeleteAction;
+		
+		if (tfComment){
+			undeleteAction = [UIAlertAction actionWithTitle:@"tf did that say?" style:nil handler:^(UIAlertAction* action){getUndeleteCommentData(tfController, tfComment);}];
+		} else {
+			undeleteAction = [UIAlertAction actionWithTitle:@"tf did that say?" style:nil handler:^(UIAlertAction* action){[tfController handleUndeletePostAction];}];
+		}
+		
+		[arg1 addAction:undeleteAction];
+		
+	}
+	
+	%orig;
+}
+
+%end
+
+
 
 
 %hook NRTLinkViewController
@@ -119,11 +97,6 @@ void getUndeleteCommentData(id controller, id comment){
 	[[self tableView] reloadData];
 }
 
-%new
--(void) handleUndeleteCommentAction:(id) comment{
-	getUndeleteCommentData(self, comment);
-}
-
 %new
 -(void) handleUndeletePostAction{
 	
@@ -158,8 +131,6 @@ void getUndeleteCommentData(id controller, id comment){
 		[self performSelectorOnMainThread:@selector(completeUndeletePost:) withObject:@{@"body":body, @"author":author, @"post":post} waitUntilDone:NO];
 		
 	}];
-	
-	
 }
 
 -(void) swipeCell:(id) arg1 didEndDragWithState:(NSUInteger) arg2{
@@ -168,66 +139,32 @@ void getUndeleteCommentData(id controller, id comment){
 		
 		if ([arg1 isKindOfClass:[%c(NRTCommentTableViewCell) class]]) {
 		
-			id comment = [arg1 comment];
-			NSInteger commentIndex = [[[self commentsManager] comments] indexOfObject:comment];
+			tfComment = [arg1 comment];
+			tfController = self;
+			shouldHaveUndeleteAction = YES;
 			
-			UIAlertController* alert = recreateActionSheet(self, comment, commentIndex);			
-			
-			[self presentViewController:alert animated:YES completion:nil];
-		
-		} else {
-			%orig;
-		}
-	} else {
-		%orig;
-	}
+		} 
+	} 
+	
+	%orig;
+	
+	shouldHaveUndeleteAction = NO;
 }
 
 
 -(void) _dotsButtonTouched:(id) arg1{
 	
-	id post = [self link];
-	BOOL shouldHaveUndeleteAction = NO;
-	
-	UIAlertController* alert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:nil];
-	
-	UIAlertAction* undeletePostAction;
-	
-	UIAlertAction* sharePostAction = [UIAlertAction actionWithTitle:@"share reddit post" style:nil handler:^(UIAlertAction* action){[self _handleActionSheetSharePost];}];
-	UIAlertAction* sortCommentsAction = [UIAlertAction actionWithTitle:@"sort comments" style:nil handler:^(UIAlertAction* action){[self _handleActionSheetSortComments];}];
-	UIAlertAction* refreshCommentsAction = [UIAlertAction actionWithTitle:@"refresh comments" style:nil handler:^(UIAlertAction* action){[self _handleActionSheetRefreshComments];}];
-	UIAlertAction* reportPostAction = [UIAlertAction actionWithTitle:@"report post" style:nil handler:^(UIAlertAction* action){[self _handleActionSheetReportPost];}];
-	UIAlertAction* cancelAction = [UIAlertAction actionWithTitle:@"cancel" style:UIAlertActionStyleCancel handler:nil];
-	
-	[alert addAction:sharePostAction];
-	[alert addAction:sortCommentsAction];
-	[alert addAction:refreshCommentsAction];
-	
 	if ([self linkTextOffscreenCell]){
-		UIAlertAction* refreshPostAction = [UIAlertAction actionWithTitle:@"refresh post" style:nil handler:^(UIAlertAction* action){[self _handleActionSheetRefreshPost];}];
-		[alert addAction:refreshPostAction];
 		
-		undeletePostAction = [UIAlertAction actionWithTitle:@"tf did that say?" style:nil handler:^(UIAlertAction* action){[self handleUndeletePostAction];}];
+		tfController = self;
+		tfComment = nil;
 		shouldHaveUndeleteAction = YES;
-	}
-	
-	if ([[post author] isEqualToString:[[%c(NRTAuthManager) sharedManager] currentUsername]]){
-		UIAlertAction* editPostAction = [UIAlertAction actionWithTitle:@"edit post" style:nil handler:^(UIAlertAction* action){[self _handleActionSheetEditPost];}];
-		UIAlertAction* deletePostAction = [UIAlertAction actionWithTitle:@"delete post" style:nil handler:^(UIAlertAction* action){[self _handleActionSheetDeletePost];}];
 		
-		[alert addAction:editPostAction];
-		[alert addAction:deletePostAction];
 	}
 	
-	[alert addAction:reportPostAction];
-	[alert addAction:cancelAction];
-	
-	if (shouldHaveUndeleteAction){
-		[alert addAction:undeletePostAction];
-	}
-	
-	[self presentViewController:alert animated:YES completion:nil];
+	%orig;
 	
+	shouldHaveUndeleteAction = NO;
 }
 
 %end
@@ -249,30 +186,22 @@ void getUndeleteCommentData(id controller, id comment){
 	}
 }
 
-%new
--(void) handleUndeleteCommentAction:(id) comment{
-	getUndeleteCommentData(self, comment);
-}
-
 -(void) swipeCell:(id) arg1 didEndDragWithState:(NSUInteger) arg2{
 
 	if (arg2 == 2){
 		
 		if ([arg1 isKindOfClass:[%c(NRTCommentTableViewCell) class]]) {
-		
-			id comment = [arg1 comment];
-			NSInteger commentIndex = [[[self commentsManager] comments] indexOfObject:comment];
 			
-			UIAlertController* alert = recreateActionSheet(self, comment, commentIndex);	
-			
-			[[self parentController]  presentViewController:alert animated:YES completion:nil];
+			tfComment = [arg1 comment];
+			tfController = self;
+			shouldHaveUndeleteAction = YES;
 		
-		} else {
-			%orig;
-		}
-	} else {
-		%orig;
-	}
+		} 
+	} 
+	
+	%orig;
+	
+	shouldHaveUndeleteAction = NO;
 }
 
 %end