go/mailpit
1
0
Fork 0
mirror of https://github.com/axllent/mailpit.git synced 2025-06-23 00:29:15 +02:00
Code Issues Releases Activity

UI: Display message previews on separate line (#175)

Browse Source
This commit is contained in:
Ralph Slooten
2023-10-06 17:04:03 +13:00
parent c004c1065e
commit e5703d0805
4 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/storage/utils.go
View File

@ -62,6 +62,9 @@ func createSearchText(env *enmime.Envelope) string {
// CleanString removes unwanted characters from stored search text and search queries // CleanString removes unwanted characters from stored search text and search queries
func cleanString(str string) string { func cleanString(str string) string {
// replace \uFEFF with space, see https://github.com/golang/go/issues/42274#issuecomment-1017258184
str = strings.ReplaceAll(str, string('\uFEFF'), " ")
// remove/replace new lines // remove/replace new lines
re := regexp.MustCompile(`(\r?\n|\t|>|<|"|\,|;|\(|\))`) re := regexp.MustCompile(`(\r?\n|\t|>|<|"|\,|;|\(|\))`)
str = re.ReplaceAllString(str, " ") str = re.ReplaceAllString(str, " ")

18
internal/tools/snippets.go
View File

@ -6,11 +6,11 @@ import (
) )
// CreateSnippet returns a message snippet. It will use the HTML version (if it exists) // CreateSnippet returns a message snippet. It will use the HTML version (if it exists)
// and fall back to the text version. // otherwise the text version.
func CreateSnippet(text, html string) string { func CreateSnippet(text, html string) string {
text = strings.TrimSpace(text) text = strings.TrimSpace(text)
html = strings.TrimSpace(html) html = strings.TrimSpace(html)
characters := 200 limit := 200
spaceRe := regexp.MustCompile(`\s+`) spaceRe := regexp.MustCompile(`\s+`)
nlRe := regexp.MustCompile(`\r?\n`) nlRe := regexp.MustCompile(`\r?\n`)
@ -20,22 +20,26 @@ func CreateSnippet(text, html string) string {
if html != "" { if html != "" {
data := nlRe.ReplaceAllString(stripHTML(html), " ") data := nlRe.ReplaceAllString(stripHTML(html), " ")
// replace \uFEFF with space, see https://github.com/golang/go/issues/42274#issuecomment-1017258184
data = strings.ReplaceAll(data, string('\uFEFF'), " ")
data = strings.TrimSpace(spaceRe.ReplaceAllString(data, " ")) data = strings.TrimSpace(spaceRe.ReplaceAllString(data, " "))
if len(data) <= characters { if len(data) <= limit {
return data return data
} }
return data[0:characters] + "..." return data[0:limit] + "..."
} }
if text != "" { if text != "" {
text = spaceRe.ReplaceAllString(text, " ") // replace \uFEFF with space, see https://github.com/golang/go/issues/42274#issuecomment-1017258184
if len(text) <= characters { text = strings.ReplaceAll(text, string('\uFEFF'), " ")
text = strings.TrimSpace(spaceRe.ReplaceAllString(text, " "))
if len(text) <= limit {
return text return text
} }
return text[0:characters] + "..." return text[0:limit] + "..."
} }
return "" return ""

4
server/ui-src/assets/styles.scss
View File

@ -95,10 +95,6 @@
.message { .message {
.subject { .subject {
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
overflow: hidden;
color: $text-muted; color: $text-muted;
b { b {

8
server/ui-src/components/ListMessages.vue
View File

@ -141,11 +141,13 @@ export default {
</div> </div>
</div> </div>
<div class="col-lg-6 col-xxl-7 mt-2 mt-lg-0"> <div class="col-lg-6 col-xxl-7 mt-2 mt-lg-0">
<div class="subject"> <div class="subject text-truncate">
<b>{{ message.Subject != "" ? message.Subject : "[ no subject ]" }}</b> <b>{{ message.Subject != "" ? message.Subject : "[ no subject ]" }}</b>
<small v-if="message.Snippet != ''" class="small">&nbsp; {{ message.Snippet }}</small>
</div> </div>
<div> <div v-if="message.Snippet != ''" class="small text-muted text-truncate">
{{ message.Snippet }}
</div>
<div v-if="message.Tags.length">
<RouterLink class="badge me-1" v-for="t in message.Tags" :to="'/search?q=' + tagEncodeURI(t)" <RouterLink class="badge me-1" v-for="t in message.Tags" :to="'/search?q=' + tagEncodeURI(t)"
:style="mailbox.showTagColors ? { backgroundColor: colorHash(t) } : { backgroundColor: '#6c757d' }" :style="mailbox.showTagColors ? { backgroundColor: colorHash(t) } : { backgroundColor: '#6c757d' }"
:title="'Filter messages tagged with ' + t"> :title="'Filter messages tagged with ' + t">