From 1e5b3d41fa93a69b8acce5d3e8a397e5d72d199b Mon Sep 17 00:00:00 2001
From: Felix Riehm <mail@felixriehm.de>
Date: Tue, 20 Feb 2024 14:25:14 +0100
Subject: [PATCH] remove email trigger for some errors, use mute icon also for
not embedded version
---
api/service/bloxberg/database.go | 5 -----
api/service/keeper/database.go | 5 -----
api/service/minerva/database.go | 4 ----
web/src/canvas/canvas.ts | 8 ++------
web/src/canvas/info_box.ts | 2 +-
5 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/api/service/bloxberg/database.go b/api/service/bloxberg/database.go
index 56136f6..3afa9a3 100644
--- a/api/service/bloxberg/database.go
+++ b/api/service/bloxberg/database.go
@@ -3,7 +3,6 @@ package bloxberg
import (
"api/database"
"api/utils/log"
- "api/utils/mail"
"encoding/hex"
"fmt"
"github.com/jmoiron/sqlx"
@@ -40,7 +39,6 @@ func (dbc *Database) Init() error {
dbc.isConnecting = false
logMessage := "Can not connect to Minerva DB"
log.Error(logMessage, err, log.Bloxberg, log.Database)
- mail.SendErrorMail(logMessage, err)
return err
}
@@ -110,7 +108,6 @@ func (dbc *Database) LoadBlocks(fromTimepoint string, toTimepoint string) (valid
if queryError != nil {
logMessage := "Error while loading bloxberg blocks."
log.Error(logMessage, queryError, log.Bloxberg, log.Database)
- mail.SendErrorMail(logMessage, queryError)
return validData, queryError
}
@@ -181,7 +178,6 @@ func (dbc *Database) LoadConfirmedTransactions(fromTimepoint string, toTimepoint
if queryError != nil {
logMessage := "Error while loading bloxberg confirmed transactions."
log.Error(logMessage, queryError, log.Bloxberg, log.Database)
- mail.SendErrorMail(logMessage, queryError)
return validData, queryError
}
@@ -253,7 +249,6 @@ func (dbc *Database) LoadLicensedContributors(fromTimepoint string, toTimepoint
if queryError != nil {
logMessage := "Error while loading bloxberg LicensedContributors."
log.Error(logMessage, queryError, log.Bloxberg, log.Database)
- mail.SendErrorMail(logMessage, queryError)
return validData, queryError
}
diff --git a/api/service/keeper/database.go b/api/service/keeper/database.go
index 518a0ed..f7ec773 100644
--- a/api/service/keeper/database.go
+++ b/api/service/keeper/database.go
@@ -3,7 +3,6 @@ package keeper
import (
"api/database"
"api/utils/log"
- "api/utils/mail"
"fmt"
"github.com/jmoiron/sqlx"
"time"
@@ -42,7 +41,6 @@ func (dbc *Database) Init() error {
dbc.isConnecting = false
logMessage := "Can not connect to Keeper DB"
log.Error(logMessage, err, log.Keeper, log.Database)
- mail.SendErrorMail(logMessage, err)
return err
}
@@ -116,7 +114,6 @@ func (dbc *Database) LoadFileCreationsAndEditings(fromTimepoint string, toTimepo
if queryError != nil {
logMessage := "Error while loading keeper file creations and editings."
log.Error(logMessage, queryError, log.Keeper, log.Database)
- mail.SendErrorMail(logMessage, queryError)
return validData, queryError
}
@@ -175,7 +172,6 @@ func (dbc *Database) LoadLibraryCreations(fromTimepoint string, toTimepoint stri
if queryError != nil {
logMessage := "Error while loading library creations."
log.Error(logMessage, queryError, log.Keeper, log.Database)
- mail.SendErrorMail(logMessage, queryError)
return validData, queryError
}
@@ -229,7 +225,6 @@ func (dbc *Database) LoadActivatedUsers(fromTimepointSeconds int64, toTimepointS
if queryError != nil {
logMessage := "Error while loading activated users."
log.Error(logMessage, queryError, log.Keeper, log.Database)
- mail.SendErrorMail(logMessage, queryError)
return validData, queryError
}
diff --git a/api/service/minerva/database.go b/api/service/minerva/database.go
index bc19b18..cc89d0d 100644
--- a/api/service/minerva/database.go
+++ b/api/service/minerva/database.go
@@ -3,7 +3,6 @@ package minerva
import (
"api/database"
"api/utils/log"
- "api/utils/mail"
"fmt"
"strings"
"time"
@@ -41,7 +40,6 @@ func (dbc *Database) Init() error {
dbc.isConnecting = false
logMessage := "Can not connect to Minerva DB"
log.Error(logMessage, err, log.Minerva, log.Database)
- mail.SendErrorMail(logMessage, err)
return err
}
@@ -110,7 +108,6 @@ func (dbc *Database) LoadMessagesFromTimepointUntilNow(fromTimepointMs int64, to
if queryError != nil {
logMessage := "Error while loading messages."
log.Error(logMessage, queryError, log.Minerva, log.Database)
- mail.SendErrorMail(logMessage, queryError)
return validData, queryError
}
@@ -177,7 +174,6 @@ func (dbc *Database) LoadIpAddressesFromUserFromTimepointUntilNow(userid string,
if queryError != nil {
logMessage := "Error while loading user ip addresses."
log.Error(logMessage, queryError, log.Minerva, log.Database)
- mail.SendErrorMail(logMessage, queryError)
return validUserIpAddresses, queryError
}
diff --git a/web/src/canvas/canvas.ts b/web/src/canvas/canvas.ts
index 835c9c3..db349ef 100644
--- a/web/src/canvas/canvas.ts
+++ b/web/src/canvas/canvas.ts
@@ -98,7 +98,7 @@ export class Canvas {
}
// needs to be here because otherwise the transition animation layer of the carousel would lay above the mute icon
- // and block the cursor event the mute icon
+ // and block the cursor event of the mute icon
this.mute_icon = new MuteIcon(this)
// needs to be added after the carousel transition because the transition layer spans over the entire screen
@@ -110,11 +110,7 @@ export class Canvas {
this.renderCurrentTheme();
if(!settings.kiosk_mode && !settings.audio_mute){
- if(settings.embedded_mode){
- this.mute_icon.show()
- } else {
- this.info_box_audio.show(InfoboxType.audio_enable, true)
- }
+ this.mute_icon.show()
}
window.onresize = (_) => this.windowUpdate();
diff --git a/web/src/canvas/info_box.ts b/web/src/canvas/info_box.ts
index f982e23..86c2e7f 100644
--- a/web/src/canvas/info_box.ts
+++ b/web/src/canvas/info_box.ts
@@ -211,6 +211,6 @@ export enum InfoboxType {
network_websocket_connecting,
network_database_connecting,
network_database_can_not_connect,
- audio_enable,
+ audio_enable, // nowhere used because it was dismissed in favour of the mute icon
legend
}
\ No newline at end of file
--
GitLab