Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-11 13:16:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-2105: Ensure ClientVersion is set in bug report request

Browse Source
This commit is contained in:
James Houlahan
2022-11-18 21:19:55 +01:00
parent c22037462e
commit 9868fae735
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/bridge/bug_report.go
View File

@ -26,6 +26,7 @@ import (
"path/filepath" "path/filepath"
"sort" "sort"
"github.com/ProtonMail/proton-bridge/v2/internal/constants"
"github.com/ProtonMail/proton-bridge/v2/internal/logging" "github.com/ProtonMail/proton-bridge/v2/internal/logging"
"github.com/ProtonMail/proton-bridge/v2/internal/vault" "github.com/ProtonMail/proton-bridge/v2/internal/vault"
"gitlab.protontech.ch/go/liteapi" "gitlab.protontech.ch/go/liteapi"
@ -75,10 +76,14 @@ func (bridge *Bridge) ReportBug(ctx context.Context, osType, osVersion, descript
var matchFiles []string var matchFiles []string
// Include bridge logs, up to a maximum amount.
matchFiles = append(matchFiles, logs[max(0, len(logs)-(MaxCompressedFilesCount/2)):]...) matchFiles = append(matchFiles, logs[max(0, len(logs)-(MaxCompressedFilesCount/2)):]...)
// Include crash logs, up to a maximum amount.
matchFiles = append(matchFiles, crashes[max(0, len(crashes)-(MaxCompressedFilesCount/2)):]...) matchFiles = append(matchFiles, crashes[max(0, len(crashes)-(MaxCompressedFilesCount/2)):]...)
// bridge-gui keeps just one small (~ 1kb) log file; we always include it.
if len(guiLogs) > 0 { if len(guiLogs) > 0 {
// bridge-gui is keeping only one log file and it's small (~ 1kb), so we include it regardless of file count
matchFiles = append(matchFiles, guiLogs[len(guiLogs)-1]) matchFiles = append(matchFiles, guiLogs[len(guiLogs)-1])
} }
@ -103,8 +108,14 @@ func (bridge *Bridge) ReportBug(ctx context.Context, osType, osVersion, descript
return bridge.api.ReportBug(ctx, liteapi.ReportBugReq{ return bridge.api.ReportBug(ctx, liteapi.ReportBugReq{
OS: osType, OS: osType,
OSVersion: osVersion, OSVersion: osVersion,
Title: "[Bridge] Bug",
Description: description, Description: description,
Client: client, Client: client,
ClientType: liteapi.ClientTypeEmail,
ClientVersion: constants.AppVersion(bridge.curVersion.Original()),
Username: account, Username: account,
Email: email, Email: email,
}, atts...) }, atts...)