forked from lint/TFDidThatSay
Fix Apollo bug, add prefs, update Narwhal menu
This commit is contained in:
lint
@ -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 -- */
|
||||
|
||||
@ -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"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
177
tweak/Narwhal.xm
177
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
|
||||
|
||||
Reference in New Issue
Block a user