adium 2499:0caed02d9240: It's kind of pointless to go from NSStr...
commits at adium.im
commits at adium.im
Sat Jun 13 02:49:51 UTC 2009
details: http://hg.adium.im/adium/rev/0caed02d9240
revision: 2499:0caed02d9240
author: Zachary West <zacw at adium.im>
date: Fri Jun 12 22:49:31 2009 -0400
It's kind of pointless to go from NSString -> unsigned long long -> NSString…always use strings for IDs, it's not like we need to save them.
diffs (366 lines):
diff -r 2a4ac0570326 -r 0caed02d9240 Plugins/Twitter Plugin/AITwitterAccount.m
--- a/Plugins/Twitter Plugin/AITwitterAccount.m Fri Jun 12 17:57:30 2009 -0700
+++ b/Plugins/Twitter Plugin/AITwitterAccount.m Fri Jun 12 22:49:31 2009 -0400
@@ -434,10 +434,8 @@
NSString *requestID;
if(inContentMessage.chat.isGroupChat) {
- NSInteger replyID = [[inContentMessage.chat valueForProperty:@"TweetInReplyToStatusID"] unsignedLongLongValue];
-
requestID = [twitterEngine sendUpdate:inContentMessage.encodedMessage
- inReplyTo:replyID];
+ inReplyTo:[inContentMessage.chat valueForProperty:@"TweetInReplyToStatusID"]];
if(requestID) {
[self setRequestType:AITwitterSendUpdate
@@ -447,7 +445,7 @@
inContentMessage.displayContent = NO;
- AILogWithSignature(@"%@ Sending update [in reply to %d]: %@", self, replyID, inContentMessage.encodedMessage);
+ AILogWithSignature(@"%@ Sending update [in reply to %@]: %@", self, [inContentMessage.chat valueForProperty:@"TweetInReplyToStatusID"], inContentMessage.encodedMessage);
}
} else {
@@ -1038,7 +1036,7 @@
}
NSString *requestID;
- NSUInteger lastID;
+ NSString *lastID;
// We haven't completed the timeline nor replies. This lets us know if we should display statuses.
followedTimelineCompleted = repliesCompleted = NO;
@@ -1056,8 +1054,8 @@
AILogWithSignature(@"%@ Periodic update fire", self);
// Pull direct messages
- lastID = [[self preferenceForKey:TWITTER_PREFERENCE_DM_LAST_ID
- group:TWITTER_PREFERENCE_GROUP_UPDATES] unsignedLongLongValue];
+ lastID = [self preferenceForKey:TWITTER_PREFERENCE_DM_LAST_ID
+ group:TWITTER_PREFERENCE_GROUP_UPDATES];
requestID = [twitterEngine getDirectMessagesSinceID:lastID startingAtPage:1];
@@ -1070,8 +1068,8 @@
}
// Pull followed timeline
- lastID = [[self preferenceForKey:TWITTER_PREFERENCE_TIMELINE_LAST_ID
- group:TWITTER_PREFERENCE_GROUP_UPDATES] unsignedLongLongValue];
+ lastID = [self preferenceForKey:TWITTER_PREFERENCE_TIMELINE_LAST_ID
+ group:TWITTER_PREFERENCE_GROUP_UPDATES];
requestID = [twitterEngine getFollowedTimelineFor:nil
sinceID:lastID
@@ -1087,8 +1085,8 @@
}
// Pull the replies feed
- lastID = [[self preferenceForKey:TWITTER_PREFERENCE_REPLIES_LAST_ID
- group:TWITTER_PREFERENCE_GROUP_UPDATES] unsignedLongLongValue];
+ lastID = [self preferenceForKey:TWITTER_PREFERENCE_REPLIES_LAST_ID
+ group:TWITTER_PREFERENCE_GROUP_UPDATES];
requestID = [twitterEngine getRepliesSinceID:lastID startingAtPage:1];
@@ -1194,7 +1192,7 @@
*/
- (void)toggleFavoriteTweet:(NSString *)tweetID
{
- NSString *requestID = [twitterEngine markUpdate:[tweetID unsignedLongLongValue] asFavorite:YES];
+ NSString *requestID = [twitterEngine markUpdate:tweetID asFavorite:YES];
if (requestID) {
[self setRequestType:AITwitterFavoriteYes
@@ -1216,7 +1214,7 @@
*/
- (void)destroyTweet:(NSString *)tweetID
{
- NSString *requestID = [twitterEngine deleteUpdate:[tweetID unsignedLongLongValue]];
+ NSString *requestID = [twitterEngine deleteUpdate:tweetID];
if(requestID) {
[self setRequestType:AITwitterDestroyStatus
@@ -1239,7 +1237,7 @@
- (void)destroyDirectMessage:(NSString *)messageID
forUser:(NSString *)userID
{
- NSString *requestID = [twitterEngine deleteDirectMessage:[messageID unsignedLongLongValue]];
+ NSString *requestID = [twitterEngine deleteDirectMessage:messageID];
AIListContact *contact = [self contactWithUID:userID];
if(requestID) {
@@ -1812,7 +1810,7 @@
BOOL addAsFavorite = ([self requestTypeForRequestID:identifier] == AITwitterFavoriteNo);
NSString *tweetID = [[self dictionaryForRequestID:identifier] objectForKey:@"tweetID"];
- NSString *requestID = [twitterEngine markUpdate:[tweetID unsignedLongLongValue]
+ NSString *requestID = [twitterEngine markUpdate:tweetID
asFavorite:addAsFavorite];
if (requestID) {
@@ -1929,7 +1927,7 @@
if ([self requestTypeForRequestID:identifier] == AITwitterUpdateFollowedTimeline) {
requestID = [twitterEngine getFollowedTimelineFor:nil
- sinceID:[lastID unsignedLongLongValue]
+ sinceID:lastID
startingAtPage:nextPage
count:TWITTER_UPDATE_TIMELINE_COUNT];
@@ -1948,7 +1946,7 @@
}
} else if ([self requestTypeForRequestID:identifier] == AITwitterUpdateReplies) {
- requestID = [twitterEngine getRepliesSinceID:[lastID unsignedLongLongValue] startingAtPage:nextPage];
+ requestID = [twitterEngine getRepliesSinceID:lastID startingAtPage:nextPage];
AILogWithSignature(@"%@ Pulling additional replies page %d", self, nextPage);
@@ -2102,17 +2100,17 @@
- (void)directMessagesReceived:(NSArray *)messages forRequest:(NSString *)identifier
{
if ([self requestTypeForRequestID:identifier] == AITwitterUpdateDirectMessage) {
- NSNumber *lastID = [self preferenceForKey:TWITTER_PREFERENCE_DM_LAST_ID
+ NSString *lastID = [self preferenceForKey:TWITTER_PREFERENCE_DM_LAST_ID
group:TWITTER_PREFERENCE_GROUP_UPDATES];
BOOL nextPageNecessary = (lastID && messages.count >= TWITTER_UPDATE_DM_COUNT);
// Store the largest tweet ID we find; this will be our "last ID" the next time we run.
- NSNumber *largestTweet = [[self dictionaryForRequestID:identifier] objectForKey:@"LargestTweet"];
+ NSString *largestTweet = [[self dictionaryForRequestID:identifier] objectForKey:@"LargestTweet"];
// The largest ID is first, compare.
if (messages.count) {
- NSNumber *tweetID = [[messages objectAtIndex:0] objectForKey:TWITTER_DM_ID];
+ NSString *tweetID = [[messages objectAtIndex:0] objectForKey:TWITTER_DM_ID];
if (!largestTweet || [largestTweet compare:tweetID] == NSOrderedAscending) {
largestTweet = tweetID;
}
@@ -2125,7 +2123,7 @@
if(nextPageNecessary) {
NSInteger nextPage = [[[self dictionaryForRequestID:identifier] objectForKey:@"Page"] intValue] + 1;
- NSString *requestID = [twitterEngine getDirectMessagesSinceID:[lastID unsignedLongLongValue]
+ NSString *requestID = [twitterEngine getDirectMessagesSinceID:lastID
startingAtPage:nextPage];
AILogWithSignature(@"%@ Pulling additional DM page %d", self, nextPage);
diff -r 2a4ac0570326 -r 0caed02d9240 Plugins/Twitter Plugin/MGTwitterEngine/MGTwitterEngine.h
--- a/Plugins/Twitter Plugin/MGTwitterEngine/MGTwitterEngine.h Fri Jun 12 17:57:30 2009 -0700
+++ b/Plugins/Twitter Plugin/MGTwitterEngine/MGTwitterEngine.h Fri Jun 12 22:49:31 2009 -0400
@@ -92,22 +92,22 @@
// Retrieving updates
- (NSString *)getFollowedTimelineFor:(NSString *)username since:(NSDate *)date startingAtPage:(int)pageNum;
- (NSString *)getFollowedTimelineFor:(NSString *)username since:(NSDate *)date startingAtPage:(int)pageNum count:(int)count; // max 200
-- (NSString *)getFollowedTimelineFor:(NSString *)username sinceID:(unsigned long long)updateID startingAtPage:(int)pageNum count:(int)count; // max 200
+- (NSString *)getFollowedTimelineFor:(NSString *)username sinceID:(NSString *)updateID startingAtPage:(int)pageNum count:(int)count; // max 200
- (NSString *)getUserTimelineFor:(NSString *)username since:(NSDate *)date count:(int)numUpdates; // max 200
- (NSString *)getUserTimelineFor:(NSString *)username since:(NSDate *)date startingAtPage:(int)pageNum count:(int)numUpdates; // max 200
-- (NSString *)getUserTimelineFor:(NSString *)username sinceID:(unsigned long long)updateID startingAtPage:(int)pageNum count:(int)numUpdates; // max 200
+- (NSString *)getUserTimelineFor:(NSString *)username sinceID:(NSString *)updateID startingAtPage:(int)pageNum count:(int)numUpdates; // max 200
- (NSString *)getUserUpdatesArchiveStartingAtPage:(int)pageNum; // 80 per page
-- (NSString *)getPublicTimelineSinceID:(unsigned long long)updateID;
-- (NSString *)getRepliesSinceID:(unsigned long long)updateID startingAtPage:(int)pageNum;
+- (NSString *)getPublicTimelineSinceID:(NSString *)updateID;
+- (NSString *)getRepliesSinceID:(NSString *)updateID startingAtPage:(int)pageNum;
- (NSString *)getRepliesStartingAtPage:(int)pageNum; // sent TO this user
- (NSString *)getFavoriteUpdatesFor:(NSString *)username startingAtPage:(int)pageNum;
-- (NSString *)getUpdate:(unsigned long long)updateID;
+- (NSString *)getUpdate:(NSString *)updateID;
// Retrieving direct messages
- (NSString *)getDirectMessagesSince:(NSDate *)date startingAtPage:(int)pageNum; // sent TO this user
-- (NSString *)getDirectMessagesSinceID:(unsigned long long)updateID startingAtPage:(int)pageNum; // sent TO this user
+- (NSString *)getDirectMessagesSinceID:(NSString *)updateID startingAtPage:(int)pageNum; // sent TO this user
- (NSString *)getSentDirectMessagesSince:(NSDate *)date startingAtPage:(int)pageNum; // sent BY this user
-- (NSString *)getSentDirectMessagesSinceID:(unsigned long long)updateID startingAtPage:(int)pageNum; // sent BY this user
+- (NSString *)getSentDirectMessagesSinceID:(NSString *)updateID startingAtPage:(int)pageNum; // sent BY this user
// Retrieving user information
- (NSString *)getUserInformationFor:(NSString *)username;
@@ -125,13 +125,13 @@
// Sending and editing updates
- (NSString *)sendUpdate:(NSString *)status;
-- (NSString *)sendUpdate:(NSString *)status inReplyTo:(unsigned long long)updateID;
-- (NSString *)deleteUpdate:(unsigned long long)updateID; // this user must be the AUTHOR
-- (NSString *)markUpdate:(unsigned long long)updateID asFavorite:(BOOL)flag;
+- (NSString *)sendUpdate:(NSString *)status inReplyTo:(NSString *)updateID;
+- (NSString *)deleteUpdate:(NSString *)updateID; // this user must be the AUTHOR
+- (NSString *)markUpdate:(NSString *)updateID asFavorite:(BOOL)flag;
// Sending and editing direct messages
- (NSString *)sendDirectMessage:(NSString *)message to:(NSString *)username;
-- (NSString *)deleteDirectMessage:(unsigned long long)updateID; // this user must be the RECIPIENT
+- (NSString *)deleteDirectMessage:(NSString *)updateID; // this user must be the RECIPIENT
// Adium OAuth additions
@property (readwrite, nonatomic) BOOL useOAuth;
diff -r 2a4ac0570326 -r 0caed02d9240 Plugins/Twitter Plugin/MGTwitterEngine/MGTwitterEngine.m
--- a/Plugins/Twitter Plugin/MGTwitterEngine/MGTwitterEngine.m Fri Jun 12 17:57:30 2009 -0700
+++ b/Plugins/Twitter Plugin/MGTwitterEngine/MGTwitterEngine.m Fri Jun 12 22:49:31 2009 -0400
@@ -958,13 +958,13 @@
}
-- (NSString *)getFollowedTimelineFor:(NSString *)username sinceID:(unsigned long long)updateID startingAtPage:(int)pageNum count:(int)count
+- (NSString *)getFollowedTimelineFor:(NSString *)username sinceID:(NSString *)updateID startingAtPage:(int)pageNum count:(int)count
{
NSString *path = @"statuses/friends_timeline.xml";
NSMutableDictionary *params = [NSMutableDictionary dictionaryWithCapacity:0];
if (updateID > 0) {
- [params setObject:[NSString stringWithFormat:@"%qu", updateID] forKey:@"since_id"];
+ [params setObject:[NSString stringWithFormat:@"%@", updateID] forKey:@"since_id"];
}
if (pageNum > 0) {
[params setObject:[NSString stringWithFormat:@"%d", pageNum] forKey:@"page"];
@@ -1015,13 +1015,13 @@
}
-- (NSString *)getUserTimelineFor:(NSString *)username sinceID:(unsigned long long)updateID startingAtPage:(int)pageNum count:(int)numUpdates
+- (NSString *)getUserTimelineFor:(NSString *)username sinceID:(NSString *)updateID startingAtPage:(int)pageNum count:(int)numUpdates
{
NSString *path = @"statuses/user_timeline.xml";
NSMutableDictionary *params = [NSMutableDictionary dictionaryWithCapacity:0];
if (updateID > 0) {
- [params setObject:[NSString stringWithFormat:@"%qu", updateID] forKey:@"since_id"];
+ [params setObject:[NSString stringWithFormat:@"%@", updateID] forKey:@"since_id"];
}
if (pageNum > 0) {
[params setObject:[NSString stringWithFormat:@"%d", pageNum] forKey:@"page"];
@@ -1054,13 +1054,13 @@
}
-- (NSString *)getPublicTimelineSinceID:(unsigned long long)updateID
+- (NSString *)getPublicTimelineSinceID:(NSString *)updateID
{
NSString *path = @"statuses/public_timeline.xml";
NSMutableDictionary *params = [NSMutableDictionary dictionaryWithCapacity:0];
if (updateID > 0) {
- [params setObject:[NSString stringWithFormat:@"%qu", updateID] forKey:@"since_id"];
+ [params setObject:[NSString stringWithFormat:@"%@", updateID] forKey:@"since_id"];
}
return [self _sendRequestWithMethod:nil path:path queryParameters:params body:nil
@@ -1101,9 +1101,9 @@
}
-- (NSString *)getUpdate:(unsigned long long)updateID
+- (NSString *)getUpdate:(NSString *)updateID
{
- NSString *path = [NSString stringWithFormat:@"statuses/show/%qu.xml", updateID];
+ NSString *path = [NSString stringWithFormat:@"statuses/show/%@.xml", updateID];
return [self _sendRequestWithMethod:nil path:path queryParameters:nil body:nil
requestType:MGTwitterStatusesRequest
@@ -1132,13 +1132,13 @@
}
-- (NSString *)getDirectMessagesSinceID:(unsigned long long)updateID startingAtPage:(int)pageNum
+- (NSString *)getDirectMessagesSinceID:(NSString *)updateID startingAtPage:(int)pageNum
{
NSString *path = @"direct_messages.xml";
NSMutableDictionary *params = [NSMutableDictionary dictionaryWithCapacity:0];
if (updateID > 0) {
- [params setObject:[NSString stringWithFormat:@"%qu", updateID] forKey:@"since_id"];
+ [params setObject:[NSString stringWithFormat:@"%@", updateID] forKey:@"since_id"];
}
if (pageNum > 0) {
[params setObject:[NSString stringWithFormat:@"%d", pageNum] forKey:@"page"];
@@ -1168,13 +1168,13 @@
}
-- (NSString *)getSentDirectMessagesSinceID:(unsigned long long)updateID startingAtPage:(int)pageNum
+- (NSString *)getSentDirectMessagesSinceID:(NSString *)updateID startingAtPage:(int)pageNum
{
NSString *path = @"direct_messages/sent.xml";
NSMutableDictionary *params = [NSMutableDictionary dictionaryWithCapacity:0];
if (updateID > 0) {
- [params setObject:[NSString stringWithFormat:@"%qu", updateID] forKey:@"since_id"];
+ [params setObject:[NSString stringWithFormat:@"%@", updateID] forKey:@"since_id"];
}
if (pageNum > 0) {
[params setObject:[NSString stringWithFormat:@"%d", pageNum] forKey:@"page"];
@@ -1270,7 +1270,7 @@
}
-- (NSString *)sendUpdate:(NSString *)status inReplyTo:(unsigned long long)updateID
+- (NSString *)sendUpdate:(NSString *)status inReplyTo:(NSString *)updateID
{
if (!status) {
return nil;
@@ -1286,7 +1286,7 @@
NSMutableDictionary *params = [NSMutableDictionary dictionaryWithCapacity:0];
[params setObject:trimmedText forKey:@"status"];
if (updateID > 0) {
- [params setObject:[NSString stringWithFormat:@"%qu", updateID] forKey:@"in_reply_to_status_id"];
+ [params setObject:[NSString stringWithFormat:@"%@", updateID] forKey:@"in_reply_to_status_id"];
}
NSString *body = [self _queryStringWithBase:nil parameters:params prefixed:NO];
@@ -1297,9 +1297,9 @@
}
-- (NSString *)deleteUpdate:(unsigned long long)updateID
+- (NSString *)deleteUpdate:(NSString *)updateID
{
- NSString *path = [NSString stringWithFormat:@"statuses/destroy/%qu.xml", updateID];
+ NSString *path = [NSString stringWithFormat:@"statuses/destroy/%@.xml", updateID];
return [self _sendRequestWithMethod:HTTP_POST_METHOD path:path queryParameters:nil body:nil
requestType:MGTwitterAccountRequest
@@ -1307,9 +1307,9 @@
}
-- (NSString *)markUpdate:(unsigned long long)updateID asFavorite:(BOOL)flag
+- (NSString *)markUpdate:(NSString *)updateID asFavorite:(BOOL)flag
{
- NSString *path = [NSString stringWithFormat:@"favorites/%@/%qu.xml",
+ NSString *path = [NSString stringWithFormat:@"favorites/%@/%@.xml",
(flag) ? @"create" : @"destroy" ,
updateID];
@@ -1347,9 +1347,9 @@
}
-- (NSString *)deleteDirectMessage:(unsigned long long)updateID
+- (NSString *)deleteDirectMessage:(NSString *)updateID
{
- NSString *path = [NSString stringWithFormat:@"direct_messages/destroy/%qu.xml", updateID];
+ NSString *path = [NSString stringWithFormat:@"direct_messages/destroy/%@.xml", updateID];
return [self _sendRequestWithMethod:HTTP_POST_METHOD path:path queryParameters:nil body:nil
requestType:MGTwitterAccountRequest
@@ -1373,13 +1373,13 @@
}
-- (NSString *)getRepliesSinceID:(unsigned long long)updateID startingAtPage:(int)pageNum
+- (NSString *)getRepliesSinceID:(NSString *)updateID startingAtPage:(int)pageNum
{
NSString *path = @"statuses/replies.xml";
NSMutableDictionary *params = [NSMutableDictionary dictionaryWithCapacity:0];
if (updateID > 0) {
- [params setObject:[NSString stringWithFormat:@"%qu", updateID] forKey:@"since_id"];
+ [params setObject:[NSString stringWithFormat:@"%@", updateID] forKey:@"since_id"];
}
if (pageNum > 0) {
[params setObject:[NSString stringWithFormat:@"%d", pageNum] forKey:@"page"];
More information about the commits
mailing list