Refactored reddit api querying

RedditBar/Reddit.h

@@ -20,4 +20,8 @@
 -(id)initWithUsername:(NSString *)name Modhash:(NSString *)hash;
 -(BOOL)isAuthenticated;
 
+-(NSData *)queryAPI:(NSString *)api withData:(NSString *)string andResponse:(NSHTTPURLResponse **)res;
+-(NSString *)urlencode:(NSString *)string;
+
+
 @end

RedditBar/Reddit.m

@@ -16,26 +16,6 @@ NSString *appName = @"RedditBar";
 
 @synthesize username, modhash, password;
 
--(NSString *)urlencode:(NSString *)string {
-    NSMutableString *output = [NSMutableString string];
-    const unsigned char *source = (const unsigned char *)[string UTF8String];
-    long sourceLen = strlen((const char *)source);
-    for (int i = 0; i < sourceLen; i++) {
-        const unsigned char thisChar = source[i];
-        if (thisChar == ' '){
-            [output appendString:@"+"];
-        } else if (thisChar == '.' || thisChar == '-' || thisChar == '_' || thisChar == '~' ||
-                   (thisChar >= 'a' && thisChar <= 'z') ||
-                   (thisChar >= 'A' && thisChar <= 'Z') ||
-                   (thisChar >= '0' && thisChar <= '9')) {
-            [output appendFormat:@"%c", thisChar];
-        } else {
-            [output appendFormat:@"%%%02X", thisChar];
-        }
-    }
-    return output;
-}
-
 -(id)initWithUsername:(NSString *)name Modhash:(NSString *)hash {
     self = [super init];
     if (self) {
@@ -60,30 +40,18 @@ NSString *appName = @"RedditBar";
     NSMutableString *stringData = [NSMutableString stringWithString:@"api_type=json"];
     [stringData appendFormat:@"&user=%@", [self urlencode: username]];
     [stringData appendFormat:@"&passwd=%@", [self urlencode: password]];
-    NSData *requestBodyData = [stringData dataUsingEncoding:NSUTF8StringEncoding];
-    NSString *requestBodyLength = [NSString stringWithFormat:@"%lu", (unsigned long)[requestBodyData length]];
-    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"https://ssl.reddit.com/api/login"]];
-    [request setTimeoutInterval:5.0];
-    [request setCachePolicy:NSURLCacheStorageNotAllowed];
-    [request setValue:@"application/x-www-form-urlencoded; charset=UTF-8" forHTTPHeaderField:@"Content-Type"];
-    [request setValue:requestBodyLength forHTTPHeaderField:@"Content-Length"];
-    [request setValue:[NSString stringWithFormat:@"%@/%@ by %@", appName, version, author] forHTTPHeaderField:@"User-Agent"];
-    [request setHTTPMethod:@"POST"];
-    [request setHTTPBody:requestBodyData];
-    NSURLResponse *response = nil;
-    NSError *error = nil;
-    NSData *data = [NSURLConnection sendSynchronousRequest:request returningResponse:&response error:&error];
-    if (error != nil) {
+    [stringData appendString:@"&rem=True"];
+    NSHTTPURLResponse *response;
+    NSData *data = [self queryAPI:@"api/login" withData:stringData andResponse:&response];
+    if (data == nil) {
         return nil;
     } else {
-        NSHTTPURLResponse *resp = (NSHTTPURLResponse *)response;
-        long code = [resp statusCode];
+        long code = [response statusCode];
         if (code == 200) {
+            NSError *error;
             id object = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
-            
             if (error)
                 return nil;
-            
             if([object isKindOfClass:[NSDictionary class]]) {
                 NSDictionary *results = object;
                 NSDictionary *json = [results valueForKey:@"json"];
@@ -102,8 +70,52 @@ NSString *appName = @"RedditBar";
     }
 }
 
+-(NSData *)queryAPI:(NSString *)api withData:(NSString *)string andResponse:(NSHTTPURLResponse **)res {
+    NSData *requestBodyData = [string dataUsingEncoding:NSUTF8StringEncoding];
+    NSString *requestBodyLength = [NSString stringWithFormat:@"%lu", (unsigned long)[requestBodyData length]];
+    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[self getAPIPoint:api]];
+    [request setTimeoutInterval:5.0];
+    [request setCachePolicy:NSURLCacheStorageNotAllowed];
+    [request setValue:@"application/x-www-form-urlencoded; charset=UTF-8" forHTTPHeaderField:@"Content-Type"];
+    [request setValue:requestBodyLength forHTTPHeaderField:@"Content-Length"];
+    [request setValue:[NSString stringWithFormat:@"%@/%@ by %@", appName, version, author] forHTTPHeaderField:@"User-Agent"];
+    [request setHTTPMethod:@"POST"];
+    [request setHTTPBody:requestBodyData];
+    NSError *error = nil;
+    NSData *data = [NSURLConnection sendSynchronousRequest:request returningResponse:res error:&error];
+    if (error)
+        return nil;
+    else
+        return data;
+}
+
 -(BOOL)isAuthenticated {
     return FALSE;
 }
 
+-(NSURL *)getAPIPoint:(NSString *)where {
+    NSString *url = @"https://ssl.reddit.com";
+    return [NSURL URLWithString:[NSString stringWithFormat:@"%@/%@", url, where]];
+}
+
+-(NSString *)urlencode:(NSString *)string {
+    NSMutableString *output = [NSMutableString string];
+    const unsigned char *source = (const unsigned char *)[string UTF8String];
+    long sourceLen = strlen((const char *)source);
+    for (int i = 0; i < sourceLen; i++) {
+        const unsigned char thisChar = source[i];
+        if (thisChar == ' '){
+            [output appendString:@"+"];
+        } else if (thisChar == '.' || thisChar == '-' || thisChar == '_' || thisChar == '~' ||
+                   (thisChar >= 'a' && thisChar <= 'z') ||
+                   (thisChar >= 'A' && thisChar <= 'Z') ||
+                   (thisChar >= '0' && thisChar <= '9')) {
+            [output appendFormat:@"%c", thisChar];
+        } else {
+            [output appendFormat:@"%%%02X", thisChar];
+        }
+    }
+    return output;
+}
+
 @end

RedditBar/RedditBar-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>113</string>
+	<string>115</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>