From e207421fcdbfd8461cb993b3501c66f5fdbef600 Mon Sep 17 00:00:00 2001 From: tateisu Date: Fri, 30 Nov 2018 13:55:05 +0900 Subject: [PATCH] fix username regex --- .../main/java/jp/juggler/subwaytooter/api/entity/TootAccount.kt | 2 +- .../java/jp/juggler/subwaytooter/util/MisskeyMarkdownDecoder.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAccount.kt b/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAccount.kt index d3c3bc22..975ae9d6 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAccount.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAccount.kt @@ -27,7 +27,7 @@ open class TootAccount(parser : TootParser, src : JSONObject) { // host, user ,(instance) internal val reAccountUrl : Pattern = - Pattern.compile("""\Ahttps://([A-Za-z0-9._-]+)/@([A-Za-z0-9_][A-Za-z0-9_-]+)(?:@([A-Za-z0-9._-]+))?(?:\z|[?#])""") + Pattern.compile("""\Ahttps://([A-Za-z0-9][A-Za-z0-9._-]+)/@([\w][\w.-]+)(?:@([A-Za-z0-9][A-Za-z0-9._-]+))?(?=\z|[?#])""") fun getAcctFromUrl(url : String) : String? { val m = reAccountUrl.matcher(url) diff --git a/app/src/main/java/jp/juggler/subwaytooter/util/MisskeyMarkdownDecoder.kt b/app/src/main/java/jp/juggler/subwaytooter/util/MisskeyMarkdownDecoder.kt index 7537414f..6c3e93e3 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/util/MisskeyMarkdownDecoder.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/util/MisskeyMarkdownDecoder.kt @@ -1369,7 +1369,7 @@ object MisskeyMarkdownDecoder { // メンション @username @username@host val reMention = Pattern.compile( - """\A@([a-z0-9_]+)(?:@([a-z0-9.\-]+[a-z0-9]))?""" + """\A@([a-z0-9_]+(?:[a-z0-9_.-]+[a-z0-9_]+)?)(?:@([A-Za-z0-9][A-Za-z0-9._-]+))?""" , Pattern.CASE_INSENSITIVE )