Mastodon/SubwayTooter-Android-App
1
0
Fork 0
mirror of https://github.com/tateisu/SubwayTooter synced 2025-02-06 13:43:33 +01:00
Code Issues Releases Wiki Activity

fix username regex

Browse Source
This commit is contained in:
tateisu 2018-11-30 13:55:05 +09:00
parent fbe7485e06
commit e207421fcd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAccount.kt
View File

@ -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)

2
app/src/main/java/jp/juggler/subwaytooter/util/MisskeyMarkdownDecoder.kt
View File

@ -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
)