Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
40c02838
Unverified
Commit
40c02838
authored
Apr 07, 2018
by
Leonardo Aramaki
Committed by
GitHub
Apr 07, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1040 from RocketChat/fix/quote-missing
[HOTFIX] Fix regex used to strip quote markdown links
parents
d8219843
e493926b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
ViewModelMapper.kt
...chat/rocket/android/chatroom/viewmodel/ViewModelMapper.kt
+3
-3
No files found.
app/src/main/java/chat/rocket/android/chatroom/viewmodel/ViewModelMapper.kt
View file @
40c02838
...
@@ -68,8 +68,8 @@ class ViewModelMapper @Inject constructor(private val context: Context,
...
@@ -68,8 +68,8 @@ class ViewModelMapper @Inject constructor(private val context: Context,
}
}
mapMessage
(
message
).
let
{
mapMessage
(
message
).
let
{
if
(
list
.
size
>
0
)
{
if
(
list
.
isNotEmpty
()
)
{
it
.
preview
=
list
[
0
]
.
preview
it
.
preview
=
list
.
first
()
.
preview
}
}
list
.
add
(
it
)
list
.
add
(
it
)
}
}
...
@@ -213,7 +213,7 @@ class ViewModelMapper @Inject constructor(private val context: Context,
...
@@ -213,7 +213,7 @@ class ViewModelMapper @Inject constructor(private val context: Context,
private
suspend
fun
stripMessageQuotes
(
message
:
Message
):
Message
{
private
suspend
fun
stripMessageQuotes
(
message
:
Message
):
Message
{
val
baseUrl
=
settings
.
baseUrl
()
val
baseUrl
=
settings
.
baseUrl
()
return
message
.
copy
(
return
message
.
copy
(
message
=
message
.
message
.
replace
(
"\\[
\\s\\]\\($baseUrl.*
\\)"
.
toRegex
(),
""
).
trim
()
message
=
message
.
message
.
replace
(
"\\[
[^\\]]+\\]\\($baseUrl[^)]+
\\)"
.
toRegex
(),
""
).
trim
()
)
)
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment