From 45d31838ccccc006a3b9a0c4d1da4f3b642c7e32 Mon Sep 17 00:00:00 2001 From: aric3435 <157071384+arichornloverALT@users.noreply.github.com> Date: Sat, 21 Sep 2024 19:48:39 -0500 Subject: [PATCH] Update uYouPlusPatches.xm --- Sources/uYouPlusPatches.xm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Sources/uYouPlusPatches.xm b/Sources/uYouPlusPatches.xm index df8935a580..0a031f993e 100644 --- a/Sources/uYouPlusPatches.xm +++ b/Sources/uYouPlusPatches.xm @@ -102,27 +102,27 @@ typedef NS_ENUM(NSInteger, ShareEntityType) { ShareEntityFieldClip = 8 }; -static inline NSString* extractIdWithFormat(GPBUnknownFieldSet *fields, NSInteger fieldNumber, NSString *format) { - if (![fields hasField:fieldNumber]) +static inline NSString* extractIdWithFormat(GPBUnknownFields *fields, NSInteger fieldNumber, NSString *format) { + NSArray *fieldArray = [fields fields:fieldNumber]; + if (!fieldArray) return nil; - GPBUnknownField *idField = [fields getField:fieldNumber]; - if ([idField.lengthDelimitedList count] != 1) + if ([fieldArray count] != 1) return nil; - NSString *id = [[NSString alloc] initWithData:[idField.lengthDelimitedList firstObject] encoding:NSUTF8StringEncoding]; + NSString *id = [[NSString alloc] initWithData:[fieldArray firstObject].lengthDelimited encoding:NSUTF8StringEncoding]; return [NSString stringWithFormat:format, id]; } static BOOL showNativeShareSheet(NSString *serializedShareEntity, UIView *sourceView) { GPBMessage *shareEntity = [%c(GPBMessage) deserializeFromString:serializedShareEntity]; - GPBUnknownFieldSet *fields = shareEntity.unknownFields; + GPBUnknownFields *fields = [[%c(GPBUnknownFields) alloc] initFromMessage:shareEntity]; NSString *shareUrl; - if ([fields hasField:ShareEntityFieldClip]) { - GPBUnknownField *shareEntityClip = [fields getField:ShareEntityFieldClip]; - if ([shareEntityClip.lengthDelimitedList count] != 1) + NSArray *shareEntityClip = [fields fields:ShareEntityFieldClip]; + if (shareEntityClip) { + if ([shareEntityClip count] != 1) return NO; - GPBMessage *clipMessage = [%c(GPBMessage) parseFromData:[shareEntityClip.lengthDelimitedList firstObject] error:nil]; - shareUrl = extractIdWithFormat(clipMessage.unknownFields, 1, @"https://youtube.com/clip/%@"); + GPBMessage *clipMessage = [%c(GPBMessage) parseFromData:[shareEntityClip firstObject].lengthDelimited error:nil]; + shareUrl = extractIdWithFormat([[%c(GPBUnknownFields) alloc] initFromMessage:clipMessage], 1, @"https://youtube.com/clip/%@"); } if (!shareUrl) @@ -163,7 +163,7 @@ static BOOL showNativeShareSheet(NSString *serializedShareEntity, UIView *source /* -------------------- iPad Layout -------------------- */ -%group gYouTubeNativeShare // YouTube Native Share Option - 0.2.3 - Supports YouTube v17.33.2-v19.34.2 +// %group gYouTubeNativeShare // YouTube Native Share Option - 0.2.3 - Supports YouTube v17.33.2-v19.34.2 %hook YTAccountScopedCommandResponderEvent - (void)send { GPBExtensionDescriptor *shareEntityEndpointDescriptor = [%c(YTIShareEntityEndpoint) shareEntityEndpoint]; @@ -198,7 +198,7 @@ static BOOL showNativeShareSheet(NSString *serializedShareEntity, UIView *source return %orig; } %end -%end +// %end //