fix x pattern match

closes #5
AucT · Aug 17, 2023 · 1268d1e · 1268d1e
1 parent d25614d
commit 1268d1e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "eu.auct.twitter2nitter"
         minSdk 21
         targetSdk 33
-        versionCode 6
-        versionName "1.5"
+        versionCode 8
+        versionName "1.7"
         resourceConfigurations += ["en"]
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/src/main/java/eu/auct/twitter2nitter/MainActivity.kt b/app/src/main/java/eu/auct/twitter2nitter/MainActivity.kt
@@ -133,7 +133,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun getTweet(input: String): String? {
-        val pattern: Pattern = Pattern.compile(".*?(twitter|x)\\.com(/.*?)(\\s|\$|&)")
+        val pattern: Pattern = Pattern.compile(".*?(twitter|[/.]x)\\.com(/.*?)(\\s|\$|&)")
         val matcher: Matcher = pattern.matcher(input)
         matcher.find()
 

diff --git a/app/src/test/java/eu/auct/twitter2nitter/ExampleUnitTest.kt b/app/src/test/java/eu/auct/twitter2nitter/ExampleUnitTest.kt
@@ -19,10 +19,14 @@ class ExampleUnitTest {
 
 
     private fun getTweet(input: String): String? {
-        val pattern: Pattern = Pattern.compile(".*?(twitter|x)\\.com(/.*?)(\\s|\$|&)")
+        val pattern: Pattern = Pattern.compile(".*?(twitter|[/.]x)\\.com(/.*?)(\\s|\$|&)")
         val matcher: Matcher = pattern.matcher(input)
         matcher.find()
-        return matcher.group(2)
+        try {
+            return matcher.group(2)
+        } catch (t: Throwable) {
+            return null
+        }
     }
     @Test
 
@@ -40,6 +44,10 @@ class ExampleUnitTest {
         assertEquals( "/AucT", getTweet("http://x.com/AucT"))
         assertEquals( "/AucT", getTweet("http://www.x.com/AucT"))
 
+        assertEquals( null, getTweet("http://mywebx.com/AucT"))
+        assertEquals( null, getTweet("https://mywebx.com/AucT"))
+        assertEquals( null, getTweet("http://www.mywebx.com/AucT"))
+        assertEquals( null, getTweet("https://www.mywebx.com/AucT"))
     }
 
 }