When displaying expanded URLs, ignore request parameters

Author: dcbriccetti

desktop/src/main/scala/org/talkingpuffin/ui/TweetDetailPanel.scala

@@ -125,8 +125,6 @@ class TweetDetailPanel(session: Session,
     }.peer)
   }
 
-  private def getFiltersDialog: Option[FiltersDialog] = None
-  
   private def showStatusDetails(userAndStatus: UserAndStatus, filtersDialog: Option[FiltersDialog]) {
     session.clearMessage()
     setText(userAndStatus.origUser, userAndStatus.status)
@@ -142,9 +140,11 @@ class TweetDetailPanel(session: Session,
             userAndStatus.retweetingUser))
 
         if (GlobalPrefs.isOn(PrefKeys.EXPAND_URLS)) {
-          def replaceUrl(shortUrl: String, fullUrl: String) = {
+          def urlWithoutRequestParams(url: String) = url.split("\\?")(0)
+
+          def replaceUrl(shortUrl: String, fullUrl: String) {
             val beforeText = largeTweet.getText
-            val afterText = beforeText.replace(shortUrl, fullUrl)
+            val afterText = beforeText.replace(shortUrl, urlWithoutRequestParams(fullUrl))
             if (beforeText != afterText) {
               largeTweet setText afterText
               largeTweet setCaretPosition 0

desktop/src/main/scala/org/talkingpuffin/util/ShortUrl.scala

@@ -49,11 +49,10 @@ object ShortUrl extends Loggable {
     val matcher = LinkExtractor.hyperlinkPattern.matcher(text)
     while (matcher.find) {
       val sourceUrl = matcher.group(1)
-      expandUrl(sourceUrl, (targetUrl: String) => {provideSourceAndTargetUrl(sourceUrl, targetUrl)})
+      expandUrl(sourceUrl, (targetUrl: String) => provideSourceAndTargetUrl(sourceUrl, targetUrl))
     }
   }
 
   private def urlIsShortened(url: String) = shortenerHosts.exists(url.contains(_)) ||
     shortenerRegexes.exists(r => url match {case r() => true case _ => false})
-
 }