@@ -16,6 +16,9 @@ object PrefKeys { val HIGHEST_ID = "highestId" val HIGHEST_MENTION_ID= "highestMentionId" + val HIGHEST_RETWEET_OF_ME_ID= "highestRetweetOfMeId" + val HIGHEST_RETWEET_BY_ME_ID= "highestRetweetByMeId" + val HIGHEST_RETWEET_TO_ME_ID= "highestRetweetToMeId" val HIGHEST_RECEIVED_DM_ID = "highestReceivedDmId" val HIGHEST_SENT_DM_ID = "highestSentDmId" desktop/src/main/scala/org/talkingpuffin/state/PrefKeys.scala @@ -5,17 +5,24 @@ import org.talkingpuffin.state.PrefKeys._ import org.talkingpuffin.twitter.AuthenticatedSession class DataProviders(val twitterSession: AuthenticatedSession, prefs: Preferences, progress: LongOpListener) { - val prefKeys = List(HIGHEST_ID, HIGHEST_MENTION_ID, HIGHEST_RECEIVED_DM_ID, HIGHEST_SENT_DM_ID) + val prefKeys = List(HIGHEST_ID, HIGHEST_MENTION_ID, HIGHEST_RETWEET_OF_ME_ID, + HIGHEST_RETWEET_BY_ME_ID, HIGHEST_RETWEET_TO_ME_ID, + HIGHEST_RECEIVED_DM_ID, HIGHEST_SENT_DM_ID) private def getHighest(idx: Int): Option[Long] = prefs.get(prefKeys(idx), null) match {case null => None; case v => Some(v.toLong)} val followingProvider = new FollowingProvider(twitterSession, getHighest(0), progress) val mentionsProvider = new MentionsProvider (twitterSession, getHighest(1), progress) - val dmsReceivedProvider = new DmsReceivedProvider (twitterSession, getHighest(2), progress) - val dmsSentProvider = new DmsSentProvider (twitterSession, getHighest(3), progress) + val retweetsOfMeProvider = new RetweetsOfMeProvider (twitterSession, getHighest(2), progress) + val retweetedByMeProvider = new RetweetedByMeProvider (twitterSession, getHighest(3), progress) + val retweetedToMeProvider = new RetweetedToMeProvider (twitterSession, getHighest(4), progress) + val dmsReceivedProvider = new DmsReceivedProvider (twitterSession, getHighest(5), progress) + val dmsSentProvider = new DmsSentProvider (twitterSession, getHighest(6), progress) - val providers = List(followingProvider, mentionsProvider, dmsReceivedProvider, dmsSentProvider) + val providers = List(followingProvider, mentionsProvider, retweetsOfMeProvider, + retweetedByMeProvider, retweetedToMeProvider, dmsReceivedProvider, dmsSentProvider) + val autoStartProviders = List(followingProvider, mentionsProvider, dmsReceivedProvider) val providersAndPrefKeys = providers zip prefKeys def stop = providers.foreach(_.stop) desktop/src/main/scala/org/talkingpuffin/ui/DataProviders.scala @@ -17,7 +17,7 @@ class Streams(val service: String, val twitterSession: AuthenticatedSession, var views = List[View]() - providers.providers.foreach(provider => { + providers.autoStartProviders.foreach(provider => { createView(provider, None) provider.loadNewData }) desktop/src/main/scala/org/talkingpuffin/ui/Streams.scala @@ -43,7 +43,9 @@ class TopFrame(service: String, twitterSession: AuthenticatedSession) extends Fr title = Main.title + " - " + service + " " + twitterSession.user menuBar = new MainMenuBar(streams.providers, tagUsers) reactions += { - case e: NewViewEvent => streams.createView(e.provider, None) + case e: NewViewEvent => + streams.createView(e.provider, None) + e.provider.loadNewData } listenTo(menuBar) desktop/src/main/scala/org/talkingpuffin/ui/TopFrame.scala @@ -25,6 +25,24 @@ class MentionsProvider(session: AuthenticatedSession, startingId: Option[Long], override def updateFunc:(TwitterArgs) => List[TwitterStatus] = session.getReplies } +class RetweetsOfMeProvider(session: AuthenticatedSession, startingId: Option[Long], + longOpListener: LongOpListener) + extends TweetsProvider(session, startingId, "RTs of Me", longOpListener) { + override def updateFunc:(TwitterArgs) => List[TwitterStatus] = session.getRetweetsOfMe +} + +class RetweetedByMeProvider(session: AuthenticatedSession, startingId: Option[Long], + longOpListener: LongOpListener) + extends TweetsProvider(session, startingId, "RTs by Me", longOpListener) { + override def updateFunc:(TwitterArgs) => List[TwitterStatus] = session.getRetweetedByMe +} + +class RetweetedToMeProvider(session: AuthenticatedSession, startingId: Option[Long], + longOpListener: LongOpListener) + extends TweetsProvider(session, startingId, "RTs to Me", longOpListener) { + override def updateFunc:(TwitterArgs) => List[TwitterStatus] = session.getRetweetedToMe +} + class DmsReceivedProvider(session: AuthenticatedSession, startingId: Option[Long], longOpListener: LongOpListener) extends DataProvider(session, startingId, "DMs Rcvd", longOpListener) { desktop/src/main/scala/org/talkingpuffin/ui/TweetsProvider.scala @@ -15,11 +15,13 @@ class AuthenticatedSession(val user: String, val password: String, val apiURL: S override def httpPublisher = http + implicit def page2TwitterArgs(page: Int) = TwitterArgs.page(page) + + /** * @param id the user id <i>or</i> user name of the desired friends timeline */ def getFriendsTimeline(id: String): List[TwitterStatus] = getFriendsTimeline(id,TwitterArgs()) - def getFriendsTimeline(id: String,page: Int): List[TwitterStatus] = getFriendsTimeline(id,TwitterArgs.page(page)) def getFriendsTimeline(id: String, args:TwitterArgs): List[TwitterStatus] = { parse("/statuses/friends_timeline/" + urlEncode(id) + ".xml" + args, @@ -27,14 +29,12 @@ class AuthenticatedSession(val user: String, val password: String, val apiURL: S } def getFriendsTimeline(): List[TwitterStatus] = getFriendsTimeline(user,TwitterArgs()) - def getFriendsTimeline(page: Int): List[TwitterStatus] = getFriendsTimeline(user,TwitterArgs.page(page)) def getFriendsTimeline(args:TwitterArgs): List[TwitterStatus] = getFriendsTimeline(user,args) /** * @param id the user id <i>or</i> user name of the desired user's timeline */ def getUserTimeline(id: String): List[TwitterStatus] = getUserTimeline(id,TwitterArgs()) - def getUserTimeline(id: String, page: Int): List[TwitterStatus] = getUserTimeline(id,TwitterArgs.page(page)) def getUserTimeline(id: String, args: TwitterArgs): List[TwitterStatus] = { parse("/statuses/user_timeline/" + urlEncode(id) + ".xml" + args, @@ -45,7 +45,6 @@ class AuthenticatedSession(val user: String, val password: String, val apiURL: S * @param id the user id <i>or</i> user name of the desired user's timeline with retweets */ def getHomeTimeline(id: String): List[TwitterStatus] = getHomeTimeline(id,TwitterArgs()) - def getHomeTimeline(id: String, page: Int): List[TwitterStatus] = getHomeTimeline(id,TwitterArgs.page(page)) def getHomeTimeline(id: String, args: TwitterArgs): List[TwitterStatus] = { parse("/statuses/home_timeline/" + urlEncode(id) + ".xml" + args, TwitterStatus.apply, @@ -65,21 +64,18 @@ class AuthenticatedSession(val user: String, val password: String, val apiURL: S } def getRetweetedByMe(): List[TwitterStatus] = getRetweetedByMe(TwitterArgs()) - def getRetweetedByMe(page: Int): List[TwitterStatus] = getRetweetedByMe(TwitterArgs.page(page)) def getRetweetedByMe(args: TwitterArgs): List[TwitterStatus] = { parse("/statuses/retweeted_by_me.xml" + args, TwitterStatus.apply, "status").list } def getRetweetedToMe(): List[TwitterStatus] = getRetweetedToMe(TwitterArgs()) - def getRetweetedToMe(page: Int): List[TwitterStatus] = getRetweetedToMe(TwitterArgs.page(page)) def getRetweetedToMe(args: TwitterArgs): List[TwitterStatus] = { parse("/statuses/retweeted_to_me.xml" + args, TwitterStatus.apply, "status").list } - + def getRetweetsOfMe(): List[TwitterStatus] = getRetweetsOfMe(TwitterArgs()) - def getRetweetsOfMe(page: Int): List[TwitterStatus] = getRetweetsOfMe(TwitterArgs.page(page)) def getRetweetsOfMe(args: TwitterArgs): List[TwitterStatus] = { parse("/statuses/retweets_of_me.xml" + args, TwitterStatus.apply, "status").list @@ -93,21 +89,14 @@ class AuthenticatedSession(val user: String, val password: String, val apiURL: S TwitterUser.apply).parseXMLElement() } - def getUserDetail(): TwitterUser = { - getUserDetail(user) - } + def getUserDetail(): TwitterUser = getUserDetail(user) def getReplies(): List[TwitterStatus] = { parse("/statuses/replies.xml", TwitterStatus.apply, "status").list } - def getReplies(page: Int): List[TwitterStatus] = { - getReplies(TwitterArgs.page(page)) - } - def getReplies(args: TwitterArgs): List[TwitterStatus] = { - parse("/statuses/replies.xml" + args, - TwitterStatus.apply, "status").list + parse("/statuses/replies.xml" + args, TwitterStatus.apply, "status").list } def getFriends(): XmlResult[TwitterUser] = getFriends(TwitterArgs()) @@ -138,13 +127,7 @@ class AuthenticatedSession(val user: String, val password: String, val apiURL: S def getFollowersIds(args: TwitterArgs): XmlResult[TwitterUserId] = parse("/followers/ids.xml" + args, TwitterUserId.apply, "ids", "id") - def getDirectMessages(): List[TwitterMessage] = { - getDirectMessages(TwitterArgs()) - } - - def getDirectMessages(page: Int): List[TwitterMessage] = { - getDirectMessages(TwitterArgs.page(page)) - } + def getDirectMessages(): List[TwitterMessage] = getDirectMessages(TwitterArgs()) def getDirectMessages(args: TwitterArgs): List[TwitterMessage] = { parse("/direct_messages.xml" + args, TwitterMessage.apply, "direct_message").list twitter-api/src/main/scala/org/talkingpuffin/twitter/AuthenticatedSession.scala 757cb2c08bb874681d601eb4befda1f0a37e37a6 Dave Briccetti daveb@davebsoft.com http://github.com/dcbriccetti/talking-puffin/commit/f29be78908b3ecbca9212ce7a99b5d2f1d613bce f29be78908b3ecbca9212ce7a99b5d2f1d613bce 2009-11-06T00:43:43-08:00 2009-11-06T00:43:43-08:00 Add three new retweet views (their DataProviders not turned on automatically). Use an implicit conversion to remove a lot of boilerplate methods in the Twitter API library. 690ae3f715004d905a9887d7a14c38d57e762702 Dave Briccetti daveb@davebsoft.com