Fix some formatting and enable pretty panics in non-debug mode. Closes #265

This commit is contained in:
Tulir Asokan 2021-03-11 22:53:13 +02:00
parent 922223d241
commit 3964b6fd89
6 changed files with 23 additions and 18 deletions

View File

@ -40,6 +40,7 @@ func main() {
debugLevel := strings.ToLower(os.Getenv("DEBUG"))
if debugLevel != "0" && debugLevel != "f" && debugLevel != "false" {
debug.WriteLogs = true
debug.RecoverPrettyPanic = true
}
if debugLevel == "1" || debugLevel == "t" || debugLevel == "true" {
debug.RecoverPrettyPanic = false
@ -72,6 +73,10 @@ func main() {
os.Exit(3)
}
debug.Print("Config directory:", configDir)
debug.Print("Data directory:", dataDir)
debug.Print("Cache directory:", cacheDir)
debug.Print("Download directory:", downloadDir)
gmx := NewGomuks(MainUIProvider, configDir, dataDir, cacheDir, downloadDir)

View File

@ -21,6 +21,7 @@ import (
"crypto/tls"
"encoding/gob"
"encoding/json"
"errors"
"fmt"
"io"
"io/ioutil"
@ -32,7 +33,6 @@ import (
"runtime"
dbg "runtime/debug"
"time"
"errors"
"maunium.net/go/mautrix"
"maunium.net/go/mautrix/crypto/attachment"
@ -845,9 +845,9 @@ func (c *Container) PrepareMediaMessage(room *rooms.Room, path string, rel *ifc.
return nil, err
}
content := event.MessageEventContent{
MsgType: resp.MsgType,
Body: resp.Name,
Info: resp.Info,
MsgType: resp.MsgType,
Body: resp.Name,
Info: resp.Info,
}
if resp.EncryptionInfo != nil {
content.File = &event.EncryptedFileInfo{

View File

@ -247,12 +247,12 @@ func (s *GomuksSyncer) GetFilterJSON(_ id.UserID) *mautrix.Filter {
IncludeLeave: false,
State: mautrix.FilterPart{
LazyLoadMembers: true,
Types: stateEvents,
Types: stateEvents,
},
Timeline: mautrix.FilterPart{
LazyLoadMembers: true,
Types: append(messageEvents, stateEvents...),
Limit: 50,
Types: append(messageEvents, stateEvents...),
Limit: 50,
},
Ephemeral: mautrix.FilterPart{
Types: []event.Type{event.EphemeralEventTyping, event.EphemeralEventReceipt},

View File

@ -36,7 +36,7 @@ type FuzzySearchModal struct {
container *mauview.Box
search *mauview.InputArea
search *mauview.InputArea
results *mauview.TextView
matches fuzzy.Ranks

View File

@ -42,10 +42,10 @@ func NewListEntity(ordered bool, start int, children []Entity) *ListEntity {
entity := &ListEntity{
ContainerEntity: &ContainerEntity{
BaseEntity: &BaseEntity{
Tag: "ul",
Block: true,
Tag: "ul",
Block: true,
},
Indent: 2,
Indent: 2,
Children: children,
},
Ordered: ordered,
@ -66,8 +66,8 @@ func (le *ListEntity) AdjustStyle(fn AdjustStyleFunc) Entity {
func (le *ListEntity) Clone() Entity {
return &ListEntity{
ContainerEntity: le.ContainerEntity.Clone().(*ContainerEntity),
Ordered: le.Ordered,
Start: le.Start,
Ordered: le.Ordered,
Start: le.Start,
}
}

View File

@ -34,12 +34,12 @@ import (
var tagOrder = map[string]int{
"net.maunium.gomuks.fake.invite": 4,
"m.favourite": 3,
"m.favourite": 3,
"net.maunium.gomuks.fake.direct": 2,
"": 1,
"m.lowpriority": -1,
"m.server_notice": -2,
"net.maunium.gomuks.fake.leave": -3,
"": 1,
"m.lowpriority": -1,
"m.server_notice": -2,
"net.maunium.gomuks.fake.leave": -3,
}
// TagNameList is a list of Matrix tag names where default names are sorted in a hardcoded way.