Finished PM functionality. Bumped Version to 1.2.0

RedditBar/AppDelegate.h

@@ -36,6 +36,8 @@
 @property (atomic, retain) IBOutlet NSMenu *statusMenu;
 @property (atomic, retain) IBOutlet NSApplication *application;
 @property (atomic, retain) IBOutlet NSMenuItem *firstMenuItem;
+@property (atomic, retain) IBOutlet NSMenuItem *PMItem;
+@property (atomic, retain) IBOutlet NSMenuItem *PMSeparator;
 
 @property (atomic, retain) NSStatusItem *statusItem;
 @property (atomic, retain) NSImage *statusImage;
@@ -52,16 +54,17 @@
 
 -(IBAction)showPreferences:(id)sender;
 -(IBAction)showAbout:(id)sender;
-- (IBAction)reloadCompleteList:(id)sender;
-- (IBAction)reloadNextList:(id)sender;
+-(IBAction)reloadCompleteList:(id)sender;
+-(IBAction)reloadNextList:(id)sender;
 -(IBAction)linkToOpen:(id)sender;
+-(IBAction)openUnread:(id)sender;
 
 -(void)reloadListWithOptions;
 -(void)reloadListIsAuthenticatedCallback;
 -(void)reloadListNotAuthenticatedCallback;
 -(void)reloadListHasSubredditsCallback:(NSArray *)items;
 -(void)reloadListHasFrontpageCallback:(NSArray *)items;
--(void)readPMsCallback:(NSArray *)items;
+-(void)readPMsCallback:(NSNumber *)items;
 
 -(void)prefReturnName:(NSString *)name Modhash:(NSString *)modhash subscriptions:(Boolean)subscriptions subreddits:(NSString *)subreddits length:(NSInteger)length printSubs:(Boolean)showSubreddits titleLength:(NSInteger)titleLength refresh:(NSInteger)refreshInterval;
 

RedditBar/AppDelegate.m

@@ -30,7 +30,7 @@
 
 @implementation AppDelegate
 
-@synthesize statusMenu, statusItem, statusImage, statusHighlightImage, orangeredImage, orangeredHighlightImage, prefWindow, currentState, application, api, firstMenuItem, menuItems, redditItems, lastFullName, refreshTimer;
+@synthesize statusMenu, statusItem, statusImage, statusHighlightImage, orangeredImage, orangeredHighlightImage, prefWindow, currentState, application, api, firstMenuItem, menuItems, redditItems, lastFullName, refreshTimer, PMItem, PMSeparator;
 
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
     statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength];
@@ -63,14 +63,18 @@
     [NSThread detachNewThreadSelector:@selector(readPMs:) toTarget:api withObject:self];
 }
 
--(void)readPMsCallback:(NSArray *)items {
-    if (items == nil) {
+-(void)readPMsCallback:(NSNumber *)items {
+    if ((items == nil) || ([items integerValue] == 0)) {
         [statusItem setImage:statusImage];
         [statusItem setAlternateImage:statusHighlightImage];
+        [PMItem setHidden:TRUE];
+        [PMSeparator setHidden:TRUE];
     } else {
         [statusItem setImage:orangeredImage];
         [statusItem setAlternateImage:orangeredHighlightImage];
-        // TODO put PMs in menu?!
+        [PMItem setTitle:[NSString stringWithFormat:NSLocalizedString(@"You've got %ld unread PMs!", @"PM message"), (long)items.integerValue]];
+        [PMItem setHidden:FALSE];
+        [PMSeparator setHidden:FALSE];
     }
 }
 
@@ -175,6 +179,11 @@
     }
 }
 
+-(IBAction)openUnread:(id)sender {
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://www.reddit.com/message/unread"]];
+    [NSTimer scheduledTimerWithTimeInterval:10 target:self selector:@selector(refreshTick:) userInfo:nil repeats:NO];
+}
+
 -(void)clearMenuItems {
     if (menuItems != nil) {
         for (NSUInteger i = 0; i < [menuItems count]; i++) {
@@ -189,7 +198,7 @@
     for (NSUInteger i = 0; i < [array count]; i++) {
         NSMenuItem *item = [self prepareItemForMenu:[array objectAtIndex:i]];
         [items addObject:item];
-        [statusMenu insertItem:item atIndex:i];
+        [statusMenu insertItem:item atIndex:(i + 2)];
     }
     menuItems = items;
 }

RedditBar/Base.lproj/MainMenu.strings

@@ -5,6 +5,9 @@
 /* Class = "NSMenuItem"; title = "About RedditBar"; ObjectID = "4ah-qP-9eP"; */
 "4ah-qP-9eP.title" = "About RedditBar";
 
+/* Class = "NSMenuItem"; title = "PMs..."; ObjectID = "IM8-KI-MAc"; */
+"IM8-KI-MAc.title" = "PMs...";
+
 /* Class = "NSMenuItem"; title = "Reload"; ObjectID = "bQG-wq-9Zw"; */
 "bQG-wq-9Zw.title" = "Reload";
 

RedditBar/Base.lproj/MainMenu.xib

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment defaultVersion="1080" identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
@@ -14,6 +14,8 @@
         <customObject id="-3" userLabel="Application"/>
         <customObject id="494" customClass="AppDelegate">
             <connections>
+                <outlet property="PMItem" destination="IM8-KI-MAc" id="X1H-cL-0kE"/>
+                <outlet property="PMSeparator" destination="5L0-zz-YIh" id="2X3-PW-1G9"/>
                 <outlet property="application" destination="-3" id="1K5-sF-Im7"/>
                 <outlet property="firstMenuItem" destination="jfb-mv-iN9" id="2QT-D1-leO"/>
                 <outlet property="statusMenu" destination="fuB-VS-nSq" id="AZY-3d-h8G"/>
@@ -22,6 +24,13 @@
         <customObject id="420" customClass="NSFontManager"/>
         <menu id="fuB-VS-nSq" userLabel="StatusItem">
             <items>
+                <menuItem title="PMs..." hidden="YES" enabled="NO" id="IM8-KI-MAc">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="openUnread:" target="494" id="zdP-DS-AdX"/>
+                    </connections>
+                </menuItem>
+                <menuItem isSeparatorItem="YES" hidden="YES" id="5L0-zz-YIh"/>
                 <menuItem title="Loading..." enabled="NO" id="jfb-mv-iN9">
                     <modifierMask key="keyEquivalentModifierMask"/>
                 </menuItem>

RedditBar/Reddit.m

@@ -101,6 +101,51 @@ NSString *subredditFormat = @" [r/%@]";
     }
 }
 
+-(void)readFrontpage:(id)parent {
+    NSHTTPURLResponse *response;
+    
+    NSString *after = ((AppDelegate *)parent).lastFullName;
+    Boolean showSubreddits = ((AppDelegate *)parent).currentState.showSubreddit;
+    NSString *url;
+    if (after == nil)
+        url = [NSString stringWithFormat:@"hot.json?limit=%ld", (long)length];
+    else
+        url = [NSString stringWithFormat:@"hot.json?limit=%ld&after=%@", (long)length, after];
+        
+    NSData *data = [self queryAPI:url withResponse:&response];
+    if ((data == nil) || ([response statusCode] != 200)) {
+        [parent performSelectorOnMainThread:@selector(reloadListHasFrontpageCallback:) withObject:nil waitUntilDone:false];
+    } else {
+        [parent performSelectorOnMainThread:@selector(reloadListHasFrontpageCallback:) withObject:[self convertJSONToItemArray:data ShowSubs:showSubreddits] waitUntilDone:false];
+    }
+}
+
+-(void)readSubreddits:(id)parent {
+    NSMutableString *subs = [NSMutableString stringWithString:@"r/"];
+    for (NSUInteger i = 0; i < [subreddits count]; i++) {
+        [subs appendString:[subreddits objectAtIndex:i]];
+        if (i < ([subreddits count] - 1)) {
+            [subs appendString:@"+"];
+        }
+    }
+    
+    NSString *after = ((AppDelegate *)parent).lastFullName;
+    Boolean showSubreddits = ((AppDelegate *)parent).currentState.showSubreddit;
+    NSString *url;
+    if (after == nil)
+        url = [NSString stringWithFormat:@"%@/hot.json?limit=%ld", subs, (long)length];
+    else
+        url = [NSString stringWithFormat:@"%@/hot.json?limit=%ld&after=%@", subs, (long)length, after];
+    
+    NSHTTPURLResponse *response;
+    NSData *data = [self queryAPI:url withResponse:&response];
+    if ((data == nil) || ([response statusCode] != 200)) {
+        [(AppDelegate *)parent performSelectorOnMainThread:@selector(reloadListHasSubredditsCallback:) withObject:nil waitUntilDone:FALSE];
+    } else {
+        [(AppDelegate *)parent performSelectorOnMainThread:@selector(reloadListHasSubredditsCallback:) withObject:[self convertJSONToItemArray:data ShowSubs:showSubreddits] waitUntilDone:FALSE];
+    }
+}
+
 -(NSArray *)convertJSONToItemArray:(NSData *)data ShowSubs:(Boolean)showSubs {
     NSError *error;
     NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
@@ -108,7 +153,7 @@ NSString *subredditFormat = @" [r/%@]";
     if (dat == nil)
         return nil;
     NSArray *children = [dat valueForKey:@"children"];
-    if (children == nil)
+    if ((children == nil) || ([children count] == 0))
         return nil;
     
     NSMutableArray *array = [NSMutableArray arrayWithCapacity:[children count]];
@@ -126,17 +171,17 @@ NSString *subredditFormat = @" [r/%@]";
         NSString *subreddit = [NSString stringWithFormat:subredditFormat, [current valueForKey:@"subreddit"]];
         NSInteger maxLen = titleLength;
         if ([subreddit length] >= titleLength)
-            showSubs = FALSE;
+        showSubs = FALSE;
         if (showSubs)
-            maxLen -= [subreddit length];
+        maxLen -= [subreddit length];
         if ([name length] > maxLen)
-            name = [NSString stringWithFormat:@"%@%@", [name substringToIndex:(maxLen - [replaceTextForTitle length])], replaceTextForTitle];
+        name = [NSString stringWithFormat:@"%@%@", [name substringToIndex:(maxLen - [replaceTextForTitle length])], replaceTextForTitle];
         if (showSubs)
-            name = [NSString stringWithFormat:@"%@%@", name, subreddit];
+        name = [NSString stringWithFormat:@"%@%@", name, subreddit];
         RedditItem *r = [RedditItem itemWithName:name Link:link Comments:comments Self:isSelf];
         NSString *fullName = [current valueForKey:@"title"];
         if (showSubs)
-            fullName = [NSString stringWithFormat:@"%@%@", fullName, subreddit];
+        fullName = [NSString stringWithFormat:@"%@%@", fullName, subreddit];
         [r setFullName:fullName];
         [array insertObject:r atIndex:i];
         
@@ -148,57 +193,29 @@ NSString *subredditFormat = @" [r/%@]";
     return array;
 }
 
--(void)readFrontpage:(id)parent {
-    NSHTTPURLResponse *response;
-    
-    NSString *after = ((AppDelegate *)parent).lastFullName;
-    Boolean showSubreddits = ((AppDelegate *)parent).currentState.showSubreddit;
-    NSString *url;
-    if (after == nil)
-        url = [NSString stringWithFormat:@"hot.json?limit=%ld", (long)length];
-    else
-        url = [NSString stringWithFormat:@"hot.json?limit=%ld&after=%@", (long)length, after];
-        
-    NSData *data = [self queryAPI:url withResponse:&response];
-    if ((data == nil) || ([response statusCode] != 200)) {
-        [parent performSelectorOnMainThread:@selector(reloadListHasFrontpageCallback:) withObject:nil waitUntilDone:false];
-    } else {
-        [parent performSelectorOnMainThread:@selector(reloadListHasFrontpageCallback:) withObject:[self convertJSONToItemArray:data ShowSubs:showSubreddits] waitUntilDone:false];
-    }
+-(NSNumber *)messagesCount:(NSData *)data {
+    NSError *error;
+    NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
+    NSDictionary *dat = [json valueForKey:@"data"];
+    if (dat == nil)
+        return nil;
+    NSArray *children = [dat valueForKey:@"children"];
+    if (children == nil)
+        return nil;
+    return [NSNumber numberWithInteger:[children count]];
 }
 
--(void)readSubreddits:(id)parent {
-    NSMutableString *subs = [NSMutableString stringWithString:@"r/"];
-    for (NSUInteger i = 0; i < [subreddits count]; i++) {
-        [subs appendString:[subreddits objectAtIndex:i]];
-        if (i < ([subreddits count] - 1)) {
-            [subs appendString:@"+"];
-        }
-    }
-    
-    NSString *after = ((AppDelegate *)parent).lastFullName;
-    Boolean showSubreddits = ((AppDelegate *)parent).currentState.showSubreddit;
-    NSString *url;
-    if (after == nil)
-        url = [NSString stringWithFormat:@"%@/hot.json?limit=%ld", subs, (long)length];
-    else
-        url = [NSString stringWithFormat:@"%@/hot.json?limit=%ld&after=%@", subs, (long)length, after];
-    
+-(void)readPMs:(id)parent {
+    NSString *url = @"message/unread.json";
     NSHTTPURLResponse *response;
     NSData *data = [self queryAPI:url withResponse:&response];
     if ((data == nil) || ([response statusCode] != 200)) {
-        [(AppDelegate *)parent performSelectorOnMainThread:@selector(reloadListHasSubredditsCallback:) withObject:nil waitUntilDone:FALSE];
+        [(AppDelegate *)parent performSelectorOnMainThread:@selector(readPMsCallback:) withObject:nil waitUntilDone:FALSE];
     } else {
-        [(AppDelegate *)parent performSelectorOnMainThread:@selector(reloadListHasSubredditsCallback:) withObject:[self convertJSONToItemArray:data ShowSubs:showSubreddits] waitUntilDone:FALSE];
+        [(AppDelegate *)parent performSelectorOnMainThread:@selector(readPMsCallback:) withObject:[self messagesCount:data] waitUntilDone:FALSE];
     }
 }
 
--(void)readPMs:(id)parent {
-    // TODO read PMs
-    // Fill NSArray with RedditItems for each PM, or return nil if none
-    [(AppDelegate *)parent performSelectorOnMainThread:@selector(readPMsCallback:) withObject:nil waitUntilDone:FALSE];
-}
-
 -(void)isAuthenticatedNewModhash:(id)parent {
     NSHTTPURLResponse *response;
     NSData *dat = [self queryAPI:@"api/me.json" withResponse:&response];

RedditBar/RedditBar-Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.0</string>
+	<string>1.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>249</string>
+	<string>259</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

RedditBar/de.lproj/Localizable.strings

@@ -49,3 +49,5 @@
 /* Pref API Error */
 "Wrong Username or Password!" = "Falscher Nutzername oder falsches Passwort!";
 
+/* PM message */
+"You've got %ld unread PMs!" = "%ld ungelesene PMs!";

RedditBar/de.lproj/MainMenu.strings

@@ -2,7 +2,10 @@
 "1lW-9C-xt6.title" = "Einstellungen...";
 
 /* Class = "NSMenuItem"; title = "About RedditBar"; ObjectID = "4ah-qP-9eP"; */
-"4ah-qP-9eP.title" = "About RedditBar";
+"4ah-qP-9eP.title" = "Über RedditBar";
+
+/* Class = "NSMenuItem"; title = "PMs..."; ObjectID = "IM8-KI-MAc"; */
+"IM8-KI-MAc.title" = "PMs...";
 
 /* Class = "NSMenuItem"; title = "Reload"; ObjectID = "bQG-wq-9Zw"; */
 "bQG-wq-9Zw.title" = "Neu laden";

RedditBar/en.lproj/MainMenu.strings

@@ -4,6 +4,9 @@
 /* Class = "NSMenuItem"; title = "About RedditBar"; ObjectID = "4ah-qP-9eP"; */
 "4ah-qP-9eP.title" = "About RedditBar";
 
+/* Class = "NSMenuItem"; title = "PMs..."; ObjectID = "IM8-KI-MAc"; */
+"IM8-KI-MAc.title" = "PMs...";
+
 /* Class = "NSMenuItem"; title = "Reload"; ObjectID = "bQG-wq-9Zw"; */
 "bQG-wq-9Zw.title" = "Reload";
 

RedditBarTests/de.lproj/MainMenu.strings

@@ -4,6 +4,9 @@
 /* Class = "NSMenuItem"; title = "About RedditBar"; ObjectID = "4ah-qP-9eP"; */
 "4ah-qP-9eP.title" = "About RedditBar";
 
+/* Class = "NSMenuItem"; title = "PMs..."; ObjectID = "IM8-KI-MAc"; */
+"IM8-KI-MAc.title" = "PMs...";
+
 /* Class = "NSMenuItem"; title = "Reload"; ObjectID = "bQG-wq-9Zw"; */
 "bQG-wq-9Zw.title" = "Reload";
 

RedditBarTests/en.lproj/MainMenu.strings

@@ -4,6 +4,9 @@
 /* Class = "NSMenuItem"; title = "About RedditBar"; ObjectID = "4ah-qP-9eP"; */
 "4ah-qP-9eP.title" = "About RedditBar";
 
+/* Class = "NSMenuItem"; title = "PMs..."; ObjectID = "IM8-KI-MAc"; */
+"IM8-KI-MAc.title" = "PMs...";
+
 /* Class = "NSMenuItem"; title = "Reload"; ObjectID = "bQG-wq-9Zw"; */
 "bQG-wq-9Zw.title" = "Reload";