diff --git a/go.mod b/go.mod index ec7d9cb..c85b313 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,6 @@ require ( fyne.io/fyne/v2 v2.6.2 fyne.io/x/fyne v0.0.0-20250418202416-58a230ad1acb github.com/rrivera/identicon v0.0.0-20240116195454-d5ba35832c0d - github.com/webview/webview_go v0.0.0-20240831120633-6173450d4dd6 mellium.im/xmpp v0.22.0 pain.agency/oasis-sdk v0.0.0-20250809192709-a3e5dff1aa61 ) diff --git a/go.sum b/go.sum index 65b888e..f5eff74 100644 --- a/go.sum +++ b/go.sum @@ -68,8 +68,6 @@ github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef h1:Ch6Q+AZUxDBCVqd github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef/go.mod h1:nXTWP6+gD5+LUJ8krVhhoeHjvHTutPxMYl5SvkcnJNE= 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/webview/webview_go v0.0.0-20240831120633-6173450d4dd6 h1:VQpB2SpK88C6B5lPHTuSZKb2Qee1QWwiFlC5CKY4AW0= -github.com/webview/webview_go v0.0.0-20240831120633-6173450d4dd6/go.mod h1:yE65LFCeWf4kyWD5re+h4XNvOHJEXOCOuJZ4v8l5sgk= github.com/yuin/goldmark v1.7.13 h1:GPddIs617DnBLFFVJFgpo1aBfe/4xcvMc3SB5t/D0pA= github.com/yuin/goldmark v1.7.13/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg= golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4= diff --git a/main.go b/main.go index 2e46bd4..e53aeb7 100644 --- a/main.go +++ b/main.go @@ -10,7 +10,6 @@ import ( "math/rand/v2" "net/url" "os" - "regexp" "strings" "time" @@ -33,7 +32,6 @@ import ( oasisSdk "pain.agency/oasis-sdk" // gui - optional - webview "github.com/webview/webview_go" // catppuccin "github.com/mbaklor/fyne-catppuccin" // TODO: integrated theme switcher ) @@ -44,7 +42,6 @@ var chatInfo fyne.Container var chatSidebar fyne.Container var agreesToSendingHotFuckIntoChannel bool = false -var agreesToLoadingYouTube bool = false // by sunglocto // license AGPL @@ -205,22 +202,6 @@ func CreateUITab(chatJidStr string) ChatTabUI { } - if strings.HasPrefix(chatTabs[chatJidStr].Messages[i].ImageURL, "https://youtube.com") { - fyne.Do(func() { - go func() { - e := regexp.MustCompile(`(?:https?:\/\/)?(?:www\.)?(?:m\.)?(?:youtube\.com|youtu\.be)\/(?:watch\?v=|embed\/|v\/|)(?P[a-zA-Z0-9_-]{11})`) - f := e.ReplaceAllString(chatTabs[chatJidStr].Messages[i].ImageURL, "https://youtube.com/watch?v=${video_id}") - fmt.Println(f) - w := webview.New(false) - w.SetTitle("YouTube window") - w.SetSize(480, 320, webview.HintNone) - w.Navigate(f) - w.Run() - w.Destroy() - }() - }) - return - } if strings.HasSuffix(chatTabs[chatJidStr].Messages[i].ImageURL, "mp4") || strings.HasSuffix(chatTabs[chatJidStr].Messages[i].ImageURL, "mp3") || strings.HasSuffix(chatTabs[chatJidStr].Messages[i].ImageURL, "gif") || strings.HasSuffix(chatTabs[chatJidStr].Messages[i].ImageURL, "webp") { // FIXME: This code is fucking terrible // TODO: Could check mime? url, err := url.Parse(chatTabs[chatJidStr].Messages[i].ImageURL) @@ -440,7 +421,7 @@ func main() { for _, v := range s { _, err := url.Parse(v) if err == nil && strings.HasPrefix(v, "https://") { - if strings.HasPrefix(v, "https://youtube.com") || strings.HasSuffix(v, ".png") || strings.HasSuffix(v, ".jpg") || strings.HasSuffix(v, ".jpeg") || strings.HasSuffix(v, ".webp") || strings.HasSuffix(v, ".mp4") || strings.HasSuffix(v, ".gif") { + if strings.HasSuffix(v, ".png") || strings.HasSuffix(v, ".jpg") || strings.HasSuffix(v, ".jpeg") || strings.HasSuffix(v, ".webp") || strings.HasSuffix(v, ".mp4") || strings.HasSuffix(v, ".gif") { img = v } } @@ -529,7 +510,7 @@ func main() { for _, v := range s { _, err := url.Parse(v) if err == nil && strings.HasPrefix(v, "https://") { - if strings.HasPrefix(v, "https://youtube.com") || strings.HasSuffix(v, ".png") || strings.HasSuffix(v, ".jpg") || strings.HasSuffix(v, ".jpeg") || strings.HasSuffix(v, ".webp") || strings.HasSuffix(v, ".mp4") || strings.HasSuffix(v, ".mp3") || strings.HasSuffix(v, ".gif") { + if strings.HasSuffix(v, ".png") || strings.HasSuffix(v, ".jpg") || strings.HasSuffix(v, ".jpeg") || strings.HasSuffix(v, ".webp") || strings.HasSuffix(v, ".mp4") || strings.HasSuffix(v, ".mp3") || strings.HasSuffix(v, ".gif") { ImageID = v } }