desktop/src/main/scala/org/talkingpuffin/Constants.scala desktop/src/main/scala/org/talkingpuffin/filter/CompoundFilters.scala desktop/src/main/scala/org/talkingpuffin/filter/FilterAdder.scala desktop/src/main/scala/org/talkingpuffin/filter/FilterSetChanged.scala desktop/src/main/scala/org/talkingpuffin/filter/InOutFilters.scala desktop/src/main/scala/org/talkingpuffin/filter/TextFilter.scala @@ -2,6 +2,4 @@ package org.talkingpuffin object Globals { var sessions: List[Session] = Nil - - val MaxPeopleForAutoPaneCreation = 2000 } desktop/src/main/scala/org/talkingpuffin/Globals.scala @@ -1,73 +1,45 @@ package org.talkingpuffin.filter import org.talkingpuffin.twitter.TwitterStatus -import java.util.regex.Pattern -import swing.Publisher -import swing.event.Event import org.talkingpuffin.util.Loggable import org.talkingpuffin.filter.RetweetDetector._ -import org.talkingpuffin.ui.LinkExtractor -class CompoundFilters extends Publisher { - var list = List[CompoundFilter]() - def clear = list = List[CompoundFilter]() - def matchesAll(status: TwitterStatus): Boolean = list.forall(_.matches(status)) - def matchesAny(status: TwitterStatus): Boolean = list.exists(_.matches(status)) - def add(cf: CompoundFilter) = { - list = list ::: List(cf) - publish - } - def publish: Unit = publish(new CompoundFiltersChanged) - override def toString = list.map(_.toString).mkString("↑") -} - -class CompoundFiltersChanged extends Event - -case class CompoundFilter(val textFilters: List[TextFilter], val retweet: Option[Boolean], - val commentedRetweet: Option[Boolean]) extends Loggable { +/** + * Used to match a tweet against a set of TextFilters and retweet options. + */ +case class CompoundFilter(val textFilters: List[TextFilter], + val retweet: Option[Boolean], val commentedRetweet: Option[Boolean]) + extends Loggable { + /** + * Whether the specified tweet matches all the elements of this CompoundFilter. + */ def matches(status: TwitterStatus): Boolean = { - textFilters.foreach(tf => { - val elementMatches = if (tf.isRegEx) - Pattern.compile(tf.text).matcher(tf.getCompareWith(status)).find + + def allTextFiltersMatch = textFilters.forall(tf => { + val text = tf.text + val compareWith = tf.getCompareWith(status) + + if (tf.isRegEx) + text.r.findFirstIn(compareWith).isDefined else - tf.getCompareWith(status).toUpperCase.contains(tf.text.toUpperCase) - if (! elementMatches) { - return false - } + compareWith.toUpperCase.contains(text.toUpperCase) }) - (retweet match { - case Some(rt) if rt => status.isRetweet - case _ => true - }) && - (commentedRetweet match { - case Some(rt) if rt => status.isCommentedRetweet - case _ => true - }) - } - - override def toString = - List(textFilters.map(_.toString).mkString("⇅"), retweet.toString, commentedRetweet.toString).mkString("↕") -} - -sealed abstract case class TextFilter (val text: String, val isRegEx: Boolean, - getCompareWith: (TwitterStatus) => String) { - override def toString = List(getClass.getName, text, isRegEx.toString).mkString("↓") -} -case class FromTextFilter(override val text: String, override val isRegEx: Boolean) - extends TextFilter(text, isRegEx, (status) => status.user.screenName) + def retweetFilterMatches = booleanFilterMatches(retweet, status.isRetweet) -case class TextTextFilter(override val text: String, override val isRegEx: Boolean) - extends TextFilter(text, isRegEx, (status) => status.text) + def commentedRetweetFilterMatches = booleanFilterMatches( + commentedRetweet, status.isCommentedRetweet) -case class ToTextFilter(override val text: String, override val isRegEx: Boolean) - extends TextFilter(text, isRegEx, - (status) => LinkExtractor.getReplyToInfo(status.inReplyToStatusId, status.text) match { - case Some(screenNameAndId) => screenNameAndId._1 - case _ => "" - }) + def booleanFilterMatches(filter: Option[Boolean], value: Boolean) = filter match { + case Some(f) => f == value + case _ => true + } -case class SourceTextFilter(override val text: String, override val isRegEx: Boolean) - extends TextFilter(text, isRegEx, (status) => status.sourceName) + allTextFiltersMatch && retweetFilterMatches && commentedRetweetFilterMatches + } + + override def toString = List(textFilters.map(_.toString).mkString("⇅"), + retweet.toString, commentedRetweet.toString).mkString("↕") +} desktop/src/main/scala/org/talkingpuffin/filter/CompoundFilter.scala @@ -1,6 +1,5 @@ package org.talkingpuffin.filter -import scala.swing.event.Event import scala.swing.Publisher import org.talkingpuffin.ui.{Relationships} import org.talkingpuffin.twitter.TwitterStatus @@ -12,17 +11,14 @@ import org.talkingpuffin.util.Loggable */ class FilterSet(tagUsers: TagUsers) extends Publisher with Loggable { - class InOutSet { - var cpdFilters = new CompoundFilters - var tags = List[String]() - def tagMatches(userId: Long) = tags.exists(tagUsers.contains(_, userId)) - } - var excludeFriendRetweets: Boolean = false var excludeNonFollowers: Boolean = false var useNoiseFilters: Boolean = false - val includeSet = new InOutSet - val excludeSet = new InOutSet + + val includeSet = new InOutFilters(tagUsers) + val excludeSet = new InOutFilters(tagUsers) + + val adder = new FilterAdder(this) /** * Filter the given list of statuses, returning a list of only those that pass the filters @@ -50,41 +46,6 @@ class FilterSet(tagUsers: TagUsers) extends Publisher with Loggable { statuses.filter(includeStatus) } - def muteApps(apps: List[String]) { - apps.foreach(app => excludeSet.cpdFilters.add( - CompoundFilter(List(SourceTextFilter(app, false)), None, None))) - publish - } - - def muteSenders(senders: List[String]) { - senders.foreach(sender => excludeSet.cpdFilters.add( - CompoundFilter(List(FromTextFilter(sender, false)), None, None))) - publish - } - - def muteRetweetUsers(senders: List[String]) { - senders.foreach(sender => excludeSet.cpdFilters.add( - CompoundFilter(List(FromTextFilter(sender, false)), Some(true), None))) - publish - } - - def muteSelectedUsersCommentedRetweets(senders: List[String]) { - senders.foreach(sender => { - val filters = List(FromTextFilter(sender, false)) - excludeSet.cpdFilters.add(CompoundFilter(filters, Some(true), None)) - excludeSet.cpdFilters.add(CompoundFilter(filters, None, Some(true))) - }) - publish - } - - def muteSenderReceivers(srs: List[(String, String)]) { - srs.foreach(sr => excludeSet.cpdFilters.add( - CompoundFilter(List(FromTextFilter(sr._1, false), ToTextFilter(sr._2, false)), None, None))) - publish - } - def publish: Unit = publish(new FilterSetChanged(this)) } -case class FilterSetChanged(filterSet: FilterSet) extends Event - desktop/src/main/scala/org/talkingpuffin/filter/FilterSet.scala @@ -2,49 +2,52 @@ package org.talkingpuffin.filter import scala.util.matching.Regex import scala.io.Source +import org.talkingpuffin.Constants import org.talkingpuffin.util.Loggable +/** + * Loads noise filters from a repository and finds noisy tweets. + */ object NoiseFilter extends Loggable { - var exprs = List[Regex]() - var loadError: Exception = _ - + var expressions = List[Regex]() + var loadError: Option[Exception] = None + + /** + * Returns whether the provided tweet is noise. + */ def isNoise(text: String): Boolean = { if (needsLoading) load val textOneLine = text.replaceAll("(\n|\r)", "") // Easier to match text all on one line - exprs.exists(e => { - textOneLine match { - case e() => { - debug(textOneLine + " matched " + e) - true - } - case _ => false - } - }) + val noise = expressions.exists(_.findFirstIn(textOneLine).isDefined) + if (noise) + debug(textOneLine + " matched") + noise } - + + /** + * Loads noise-matching regular expressions from an external repository. + */ def load { try { - val regExStrings = Source.fromURL("http://talkingpuffin.appspot.com/filters/noise").getLines. + val regExStrings = Source.fromURL(Constants.NoiseRepository).getLines. map(_.trim).toList.filter(_.length > 0) info("Loaded " + regExStrings) - exprs = regExStrings.map(_.r) - loadError = null + expressions = regExStrings.map(_.r) + loadError = None } catch { case e: Exception => { - loadError = e + loadError = Some(e) error(e.toString) } } } private def needsLoading: Boolean = { - exprs == Nil /* None loaded */ && loadError == null /* We didn’t previously fail on loading */ + expressions == Nil /* None loaded */ && + ! loadError.isDefined /* We didn’t previously fail on loading */ } - private def loadSamples { - exprs = List(".*web.*", ".*Twitter.*").map(_.r) - } } \ No newline at end of file desktop/src/main/scala/org/talkingpuffin/filter/NoiseFilter.scala @@ -132,7 +132,7 @@ class StatusTableModel(val options: StatusTableOptions, val tweetsProvider: Base private def mapToIdTuple(users: List[User]) = users.map(user => (user.id, user)) def muteSelectedUsers(rows: List[Int]) = { - filterSet.muteSenders(getScreenNames(rows)) + filterSet.adder.muteSenders(getScreenNames(rows)) filterAndNotify } @@ -145,24 +145,24 @@ class StatusTableModel(val options: StatusTableOptions, val tweetsProvider: Base if rti.isDefined } yield (sender, rti.get._1) - filterSet.muteSenderReceivers(senderReceivers) + filterSet.adder.muteSenderReceivers(senderReceivers) if (andViceVersa) - filterSet.muteSenderReceivers(senderReceivers map (t => (t._2, t._1))) + filterSet.adder.muteSenderReceivers(senderReceivers map (t => (t._2, t._1))) filterAndNotify } def muteSelectedUsersRetweets(rows: List[Int]) = { - filterSet.muteRetweetUsers(getScreenNames(rows)) + filterSet.adder.muteRetweetUsers(getScreenNames(rows)) filterAndNotify } def muteSelectedUsersCommentedRetweets(rows: List[Int]) = { - filterSet.muteSelectedUsersCommentedRetweets(getScreenNames(rows)) + filterSet.adder.muteSelectedUsersCommentedRetweets(getScreenNames(rows)) filterAndNotify } def muteSelectedApps(rows: List[Int]) = { - filterSet.muteApps(rows.map(i => filteredStatuses_(i).sourceName)) + filterSet.adder.muteApps(rows.map(i => filteredStatuses_(i).sourceName)) filterAndNotify } desktop/src/main/scala/org/talkingpuffin/ui/StatusTableModel.scala @@ -1,15 +1,15 @@ package org.talkingpuffin.ui -import _root_.scala.swing.event.{WindowClosing} +import java.awt.{Point, Dimension} +import java.text.NumberFormat import javax.swing.{ImageIcon} +import scala.swing.event.{WindowClosing} import swing.TabbedPane.Page import swing.{Reactor, Frame, TabbedPane, Label, GridBagPanel} +import org.talkingpuffin.{Main, Globals, Session, Constants} import org.talkingpuffin.filter.TagUsers -import org.talkingpuffin.{Main, Globals, Session} -import org.talkingpuffin.state.{StateSaver} -import java.text.NumberFormat +import org.talkingpuffin.state.StateSaver import org.talkingpuffin.twitter.{RateLimitStatusEvent, TwitterUser, AuthenticatedSession} -import java.awt.{Point, Dimension} import org.talkingpuffin.util.{FetchRequest, Loggable} /** @@ -77,7 +77,7 @@ class TopFrame(service: String, twitterSession: AuthenticatedSession) extends Fr reactions += { case ic: IdsChanged => if (peoplePane == null && - (rels.followerIds.length + rels.friendIds.length < Globals.MaxPeopleForAutoPaneCreation)) { + (rels.followerIds.length + rels.friendIds.length < Constants.MaxPeopleForAutoPaneCreation)) { debug("Not too many people, so automatically creating people pane") createPeoplePane } else { desktop/src/main/scala/org/talkingpuffin/ui/TopFrame.scala d025ced312d808e55c372c2bbf2baaad357b9d3b Dave Briccetti daveb@davebsoft.com http://github.com/dcbriccetti/talking-puffin/commit/b947d4dc762d96d72a6551ea237c9725e235b052 b947d4dc762d96d72a6551ea237c9725e235b052 2009-11-07T13:22:05-08:00 2009-11-07T13:22:05-08:00 Refactor, comment the filters code 5a5ac8774d6bf912fd2ef1713415c22be6c3cdd1 Dave Briccetti daveb@davebsoft.com