diff --git a/go.mod b/go.mod index be6831c..021d5bb 100644 --- a/go.mod +++ b/go.mod @@ -8,8 +8,8 @@ require ( github.com/makeworld-the-better-one/go-isemoji v1.3.0 github.com/rrivera/identicon v0.0.0-20240116195454-d5ba35832c0d github.com/shreve/musicwand v0.0.1 + github.com/sunglocto/oasis-sdk v0.0.0-20251128095406-3c003b830815 mellium.im/xmpp v0.22.0 - pain.agency/oasis-sdk v0.0.0-20250918002549-5a45c8afedcd ) require ( diff --git a/go.sum b/go.sum index c790e59..d33f04b 100644 --- a/go.sum +++ b/go.sum @@ -78,6 +78,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/sunglocto/oasis-sdk v0.0.0-20251128095406-3c003b830815 h1:HsI7kxYauygjRK15Iwf3FlZnU8XJwRPSmbtoNfeyBYk= +github.com/sunglocto/oasis-sdk v0.0.0-20251128095406-3c003b830815/go.mod h1:Y5iPruMLvqNwGVqB+n/+wylQjCTPKQx37I/PyLWhuzk= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic= github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= @@ -113,5 +115,3 @@ mellium.im/xmlstream v0.15.4 h1:gLKxcWl4rLMUpKgtzrTBvr4OexPeO/edYus+uK3F6ZI= mellium.im/xmlstream v0.15.4/go.mod h1:yXaCW2++fmVO4L9piKVkyLDqnCmictVYF7FDQW8prb4= mellium.im/xmpp v0.22.0 h1:UthQVSwEAr7SNrmyc90c2ykGpVHxjn/3yw8Ey4+Im8s= mellium.im/xmpp v0.22.0/go.mod h1:WSjq12nhREFD88Vy/0WD6Q8inE8t6a8w7QjzwivWitw= -pain.agency/oasis-sdk v0.0.0-20250918002549-5a45c8afedcd h1:oLKI4XqaHpJeegwRxRYH9hepFO4GYKCr6C7cLwqXTK8= -pain.agency/oasis-sdk v0.0.0-20250918002549-5a45c8afedcd/go.mod h1:eyvDgfpHo+9bdB/AkMEMZ3ETeoSONTULVx9X4w9kGAU= diff --git a/main.go b/main.go index 7c756d1..af5186c 100644 --- a/main.go +++ b/main.go @@ -33,7 +33,7 @@ import ( "mellium.im/xmpp/bookmarks" "mellium.im/xmpp/jid" "mellium.im/xmpp/muc" - oasisSdk "pain.agency/oasis-sdk" + oasisSdk "github.com/sunglocto/oasis-sdk" // TODO: integrated theme switcher ) @@ -171,6 +171,8 @@ func CreateUITab(chatJidStr string) ChatTabUI { replytext.Hide() replytext.Importance = widget.SuccessImportance replytext.Selectable = true + // replytext.Wrapping = fyne.TextWrapWord + replytext.Truncation = fyne.TextTruncateEllipsis btn := widget.NewButtonWithIcon("View media", icon, func() { }) @@ -555,7 +557,7 @@ func main() { var ImageID string = "" mucJidStr := msg.From.Bare().String() if tab, ok := chatTabs[mucJidStr]; ok { - chatInfo.Objects[0] = widget.NewLabel(fmt.Sprintf("[!] %s", mucJidStr)) + //chatInfo.Objects[0] = widget.NewLabel(fmt.Sprintf("[!] %s", mucJidStr)) chatTabs[mucJidStr].Muc = muc str := *msg.CleanedBody if strings.Contains(str, login.DisplayName) { @@ -631,7 +633,10 @@ func main() { fyne.Do(func() { UITabs[mucJidStr].Scroller.Refresh() if scrollDownOnNewMessage { - UITabs[mucJidStr].Scroller.ScrollToBottom() + tab, ok := UITabs[mucJidStr] + if ok { + tab.Scroller.ScrollToBottom() + } } }) }