Fixed Typo. Added RedditItem class. Added GET method. Check authentication.

RedditBar.xcodeproj/project.pbxproj

@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		E9341914184A1A1A00D03488 /* StateModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E9341913184A1A1A00D03488 /* StateModel.m */; };
 		E934191B184A47DE00D03488 /* Prefs.xib in Resources */ = {isa = PBXBuildFile; fileRef = E9341919184A47DE00D03488 /* Prefs.xib */; };
+		E9A129B1184BD24000F50D1D /* RedditItem.m in Sources */ = {isa = PBXBuildFile; fileRef = E9A129B0184BD24000F50D1D /* RedditItem.m */; };
 		E9B6773E184B73DC00850559 /* Reddit.m in Sources */ = {isa = PBXBuildFile; fileRef = E9B6773D184B73DC00850559 /* Reddit.m */; };
 		E9CF1F21184961010004AE02 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E9CF1F20184961010004AE02 /* Cocoa.framework */; };
 		E9CF1F2B184961010004AE02 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = E9CF1F29184961010004AE02 /* InfoPlist.strings */; };
@@ -38,6 +39,8 @@
 		E9341912184A1A1A00D03488 /* StateModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StateModel.h; sourceTree = "<group>"; };
 		E9341913184A1A1A00D03488 /* StateModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StateModel.m; sourceTree = "<group>"; };
 		E934191A184A47DE00D03488 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/Prefs.xib; sourceTree = "<group>"; };
+		E9A129AF184BD24000F50D1D /* RedditItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RedditItem.h; sourceTree = "<group>"; };
+		E9A129B0184BD24000F50D1D /* RedditItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RedditItem.m; sourceTree = "<group>"; };
 		E9B6773C184B73DC00850559 /* Reddit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reddit.h; sourceTree = "<group>"; };
 		E9B6773D184B73DC00850559 /* Reddit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reddit.m; sourceTree = "<group>"; };
 		E9CF1F1D184961010004AE02 /* RedditBar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RedditBar.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -130,6 +133,8 @@
 				E9CF1F33184961010004AE02 /* AppDelegate.m */,
 				E9B6773C184B73DC00850559 /* Reddit.h */,
 				E9B6773D184B73DC00850559 /* Reddit.m */,
+				E9A129AF184BD24000F50D1D /* RedditItem.h */,
+				E9A129B0184BD24000F50D1D /* RedditItem.m */,
 				E9341912184A1A1A00D03488 /* StateModel.h */,
 				E9341913184A1A1A00D03488 /* StateModel.m */,
 				E9CF1F35184961020004AE02 /* MainMenu.xib */,
@@ -290,6 +295,7 @@
 			files = (
 				E9CF1F34184961010004AE02 /* AppDelegate.m in Sources */,
 				E9341914184A1A1A00D03488 /* StateModel.m in Sources */,
+				E9A129B1184BD24000F50D1D /* RedditItem.m in Sources */,
 				E9CF1F2D184961010004AE02 /* main.m in Sources */,
 				E9CF1F5C1849685C0004AE02 /* PrefController.m in Sources */,
 				E9B6773E184B73DC00850559 /* Reddit.m in Sources */,

RedditBar/AppDelegate.m

@@ -25,12 +25,7 @@
     currentState = [[StateModel alloc] init];
     [self defaultPreferences];
     [self loadPreferences];
-    
-    if ([currentState.modhash isEqualToString:@""]) {
-        [firstMenuItem setTitle:@"Not logged in!"];
-    } else {
-        [self reloadListWithOptions];
-    }
+    [self reloadListWithOptions];
 }
 
 -(void)defaultPreferences {
@@ -46,7 +41,7 @@
     NSUserDefaults *store = [NSUserDefaults standardUserDefaults];
     [store setObject:currentState.username forKey:@"username"];
     [store setObject:currentState.modhash forKey:@"modhash"];
-    [store setBool:currentState.useSubsciptions forKey:@"subscriptions"];
+    [store setBool:currentState.useSubscriptions forKey:@"subscriptions"];
     [store setObject:currentState.subreddits forKey:@"subreddits"];
     [store setInteger:currentState.length forKey:@"length"];
     [store synchronize];
@@ -57,7 +52,7 @@
     [store synchronize];
     [currentState setUsername:[store stringForKey:@"username"]];
     [currentState setModhash:[store stringForKey:@"modhash"]];
-    [currentState setUseSubsciptions:[store boolForKey:@"subscriptions"]];
+    [currentState setUseSubscriptions:[store boolForKey:@"subscriptions"]];
     [currentState setSubreddits:[store arrayForKey:@"subreddits"]];
     [currentState setLength:[store integerForKey:@"length"]];
 }
@@ -68,7 +63,38 @@
         return;
     }
     api = [[Reddit alloc] initWithUsername:currentState.username Modhash:currentState.modhash];
+    NSString *tmp = @"";
+    if (![api isAuthenticatedNewModhash:&tmp]) {
+        [firstMenuItem setTitle:@"Not logged in!"];
+        return;
+    }
     
+    // Reddit gives out new modhashes all the time??
+    //if (![tmp isEqualToString:@""]) {
+    //    NSLog(@"Modhash has changed!\n");
+    //    currentState.modhash = tmp; // We got a new modhash from reddit
+    //    [self savePreferences];
+    //}
+    
+    if (currentState.useSubscriptions) {
+        NSArray *items = [api readFrontpageLength:currentState.length];
+        if (items == nil) {
+            [firstMenuItem setTitle:@"Error reading Frontpage!"];
+            return;
+        }
+        [self putItemArrayInMenu:items];
+    } else {
+        NSArray *items = [api readSubreddits:currentState.subreddits Length:currentState.length];
+        if (items == nil) {
+            [firstMenuItem setTitle:@"Error reading Subreddits!"];
+            return;
+        }
+        [self putItemArrayInMenu:items];
+    }
+}
+
+-(void)putItemArrayInMenu:(NSArray *)array {
+    // TODO populate menu
 }
 
 -(IBAction)showPreferences:(id)sender {
@@ -87,7 +113,7 @@
 -(void)prefReturnName:(NSString *)name Modhash:(NSString *)modhash subscriptions:(Boolean)subscriptions subreddits:(NSString *)subreddits length:(NSInteger)length {
     currentState.username = name;
     currentState.modhash = modhash;
-    currentState.useSubsciptions = subscriptions;
+    currentState.useSubscriptions = subscriptions;
     currentState.subreddits = [subreddits componentsSeparatedByString: @"\n"];
     currentState.length = length;
     [self savePreferences];

RedditBar/PrefController.m

@@ -31,7 +31,7 @@ NSString *subredditCharacters = @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRST
     if (![state.modhash isEqualToString:@""]) {
         [password setStringValue:modhashSetLiteral];
     }
-    [subscriptions setState:[NSNumber numberWithBool:state.useSubsciptions].integerValue];
+    [subscriptions setState:[NSNumber numberWithBool:state.useSubscriptions].integerValue];
     [self toggleSubs:nil]; // Maybe the subreddits field needs to be editable
     NSMutableString *reddits = [[NSMutableString alloc] init];
     for(int i = 0; i < [state.subreddits count]; i++) {

RedditBar/Reddit.h

@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "RedditItem.h"
 
 @interface Reddit : NSObject
 
@@ -18,7 +19,10 @@
 -(NSString *)queryModhash;
 
 -(id)initWithUsername:(NSString *)name Modhash:(NSString *)hash;
--(BOOL)isAuthenticated;
+-(BOOL)isAuthenticatedNewModhash:(NSString **)newModHash;
+
+-(NSArray *)readFrontpageLength:(NSInteger)length;
+-(NSArray *)readSubreddits:(NSArray *)source Length:(NSInteger)length;
 
 -(NSData *)queryAPI:(NSString *)api withData:(NSString *)string andResponse:(NSHTTPURLResponse **)res;
 -(NSString *)urlencode:(NSString *)string;

RedditBar/Reddit.m

@@ -36,6 +36,28 @@ NSString *appName = @"RedditBar";
     return self;
 }
 
+-(BOOL)isAuthenticatedNewModhash:(NSString **)newModHash {
+    NSHTTPURLResponse *response;
+    NSData *data = [self queryAPI:@"api/me.json" withResponse:&response];
+    if ((data != nil) && ([response statusCode] == 200)) {
+        NSError *error;
+        NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
+        NSDictionary *data = [json valueForKey:@"data"];
+        if (data == nil)
+            return FALSE;
+        NSString *newHash = [data valueForKey:@"modhash"];
+        if ((newHash == nil) || ([newHash isEqualToString:@""]))
+            return FALSE;
+        if (![newHash isEqualToString:modhash]) {
+            modhash = newHash;
+            *newModHash = newHash;
+        }
+        return TRUE;
+        
+    }
+    return FALSE;
+}
+
 -(NSString *)queryModhash {
     NSMutableString *stringData = [NSMutableString stringWithString:@"api_type=json"];
     [stringData appendFormat:@"&user=%@", [self urlencode: username]];
@@ -70,6 +92,33 @@ NSString *appName = @"RedditBar";
     }
 }
 
+-(NSArray *)readFrontpageLength:(NSInteger)length {
+    // TODO read frontpage
+    return nil;
+}
+
+-(NSArray *)readSubreddits:(NSArray *)source Length:(NSInteger)length {
+    // TODO read subreddits
+    return nil;
+}
+
+-(NSData *)queryAPI:(NSString *)api withResponse:(NSHTTPURLResponse **)res {
+    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:[NSString stringWithFormat:@"%@/%@ by %@", appName, version, author] forHTTPHeaderField:@"User-Agent"];
+    if ((modhash != nil) && (![modhash isEqualToString:@""]))
+        [request addValue:modhash forHTTPHeaderField:@"X-Modhash"];
+    [request setHTTPMethod:@"GET"];
+    NSError *error = nil;
+    NSData *data = [NSURLConnection sendSynchronousRequest:request returningResponse:res error:&error];
+    if (error)
+        return nil;
+    else
+        return data;
+}
+
 -(NSData *)queryAPI:(NSString *)api withData:(NSString *)string andResponse:(NSHTTPURLResponse **)res {
     NSData *requestBodyData = [string dataUsingEncoding:NSUTF8StringEncoding];
     NSString *requestBodyLength = [NSString stringWithFormat:@"%lu", (unsigned long)[requestBodyData length]];
@@ -79,6 +128,8 @@ NSString *appName = @"RedditBar";
     [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"];
+    if ((modhash != nil) && (![modhash isEqualToString:@""]))
+        [request addValue:modhash forHTTPHeaderField:@"X-Modhash"];
     [request setHTTPMethod:@"POST"];
     [request setHTTPBody:requestBodyData];
     NSError *error = nil;
@@ -89,10 +140,6 @@ NSString *appName = @"RedditBar";
         return data;
 }
 
--(BOOL)isAuthenticated {
-    return FALSE;
-}
-
 -(NSURL *)getAPIPoint:(NSString *)where {
     NSString *url = @"https://ssl.reddit.com";
     return [NSURL URLWithString:[NSString stringWithFormat:@"%@/%@", url, where]];

RedditBar/RedditBar-Info.plist

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

RedditBar/RedditItem.h

@@ -0,0 +1,20 @@
+//
+//  RedditItem.h
+//  RedditBar
+//
+//  Created by Thomas Buck on 01.12.13.
+//  Copyright (c) 2013 xythobuz. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface RedditItem : NSObject
+
+@property (atomic, retain) NSString *name;
+@property (atomic, retain) NSString *link;
+@property (atomic, retain) NSString *comments;
+@property (atomic) BOOL isSelf;
+
++(RedditItem *)itemWithName:(NSString *)name Link:(NSString *)link Comments:(NSString *)comments Self:(BOOL)isSelf;
+
+@end

RedditBar/RedditItem.m

@@ -0,0 +1,24 @@
+//
+//  RedditItem.m
+//  RedditBar
+//
+//  Created by Thomas Buck on 01.12.13.
+//  Copyright (c) 2013 xythobuz. All rights reserved.
+//
+
+#import "RedditItem.h"
+
+@implementation RedditItem
+
+@synthesize name, link, comments, isSelf;
+
++(RedditItem *)itemWithName:(NSString *)name Link:(NSString *)link Comments:(NSString *)comments Self:(BOOL)isSelf {
+    RedditItem *i = [[RedditItem alloc] init];
+    [i setName:name];
+    [i setLink:link];
+    [i setComments:comments];
+    [i setIsSelf:isSelf];
+    return i;
+}
+
+@end

RedditBar/StateModel.h

@@ -12,7 +12,7 @@
 
 @property (atomic, retain) NSString *username;
 @property (atomic, retain) NSString *modhash;
-@property (atomic) Boolean useSubsciptions;
+@property (atomic) Boolean useSubscriptions;
 @property (atomic, retain) NSArray *subreddits;
 @property (atomic) NSInteger length;
 

RedditBar/StateModel.m

@@ -10,6 +10,6 @@
 
 @implementation StateModel
 
-@synthesize username, modhash, useSubsciptions, subreddits;
+@synthesize username, modhash, useSubscriptions, subreddits;
 
 @end