Skip to content
Snippets Groups Projects
Commit 0a418a71 authored by Jono Wenger's avatar Jono Wenger
Browse files

Truncate message safely for log messages

parent cc80200f
Branches
Tags
1 merge request!67fix for latest client release
......@@ -322,7 +322,7 @@ func (dmc *DMClient) SendText(_ js.Value, args []js.Value) any {
jww.DEBUG.Printf("SendText(%s, %d, %s...)",
base64.RawStdEncoding.EncodeToString(partnerPubKeyBytes)[:8],
partnerToken, message[:10])
partnerToken, truncate(message, 10))
promiseFn := func(resolve, reject func(args ...any) js.Value) {
sendReport, err := dmc.api.SendText(partnerPubKeyBytes,
......@@ -381,7 +381,7 @@ func (dmc *DMClient) SendReply(_ js.Value, args []js.Value) any {
base64.RawStdEncoding.EncodeToString(partnerPubKeyBytes)[:8],
partnerToken,
base64.RawStdEncoding.EncodeToString(replyID),
message[:10])
truncate(message, 10))
promiseFn := func(resolve, reject func(args ...any) js.Value) {
sendReport, err := dmc.api.SendReply(partnerPubKeyBytes,
......@@ -428,7 +428,7 @@ func (dmc *DMClient) SendReaction(_ js.Value, args []js.Value) any {
base64.RawStdEncoding.EncodeToString(partnerPubKeyBytes)[:8],
partnerToken,
base64.RawStdEncoding.EncodeToString(replyID),
message[:10])
truncate(message, 10))
promiseFn := func(resolve, reject func(args ...any) js.Value) {
sendReport, err := dmc.api.SendReaction(partnerPubKeyBytes,
......@@ -951,3 +951,12 @@ func (c *DMDbCipher) UnmarshalJSON(_ js.Value, args []js.Value) any {
}
return nil
}
// truncate truncates the string to length n. If the string is trimmed, then
// ellipses (...) are appended.
func truncate(s string, n int) string {
if len(s)-3 <= n {
return s
}
return s[:n] + "..."
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment