diff --git a/api/service/bloxberg/database.go b/api/service/bloxberg/database.go index 56136f61a8ea0a7a89af867040315d582c84ed76..3afa9a30b3bbb40035453c76b7706be8421b84db 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 518a0eda48d38e1e229827c00d768829617a1288..f7ec77360e609d902bf8b9f62bfc13c1f1ebb7c7 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 bc19b18b39384ea2284a9d9728b83bf34a8a5efa..cc89d0dcdcef89bc342793f1475d4b79aa1ca56b 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 835c9c388a24276a7ed9b395ee09a8a001a28dfa..db349efe4c798f0d681c494e3844dc2efb0cba00 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 f982e2374f4b3a50bf23f491be0f5b33c8f3f530..86c2e7fb29c740fa1752a033e48db71ee3a8f707 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