deblan-mirror/wails
1
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2026-03-14 14:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

test linux userInfo

Browse source
This commit is contained in:
Zach Botterman 2025-02-25 16:25:06 -08:00
commit 60ae0c1598
2 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

42
v3/pkg/services/notifications/notifications_linux.go
View file

@ -4,6 +4,7 @@ package notifications
import (
"context"
"encoding/base64"
"encoding/json"
"fmt"
"os"
@ -18,6 +19,7 @@ import (
var NotificationLock sync.RWMutex
var NotificationCategories = make(map[string]NotificationCategory)
var Notifier shout.Notifier
var appName = application.Get().Config().Name
// Creates a new Notifications Service.
func New() *Service {
@ -38,8 +40,6 @@ func (ns *Service) ServiceStartup(ctx context.Context, options application.Servi
return fmt.Errorf("failed to connect to D-Bus session bus: %v", err)
}
appName := application.Get().Config().Name
var iconPath string
Notifier, err = shout.NewNotifier(conn, appName, iconPath, func(notificationID, action string, platformData map[string]dbus.Variant, target, notifierResponse dbus.Variant, err error) {
@ -52,26 +52,28 @@ func (ns *Service) ServiceStartup(ctx context.Context, options application.Servi
ActionIdentifier: action,
}
if action == "" {
response.ActionIdentifier = DefaultActionIdentifier
}
if target.Signature().String() == "s" {
var targetStr string
if err := target.Store(&targetStr); err == nil {
var userInfo map[string]interface{}
if err := json.Unmarshal([]byte(targetStr), &userInfo); err == nil {
userInfoStr, err := base64.StdEncoding.DecodeString(targetStr)
if err != nil {
if err := json.Unmarshal([]byte(targetStr), &userInfo); err == nil {
response.UserInfo = userInfo
}
}
if err := json.Unmarshal(userInfoStr, &userInfo); err == nil {
response.UserInfo = userInfo
}
}
}
if notifierResponse.Signature().String() == "s" {
var userText string
if err := notifierResponse.Store(&userText); err == nil {
response.UserText = userText
}
}
// if notifierResponse.Signature().String() == "s" {
// var userText string
// if err := notifierResponse.Store(&userText); err == nil {
// response.UserText = userText
// }
// }
if NotificationService != nil {
NotificationService.handleNotificationResponse(response)
@ -114,13 +116,13 @@ func (ns *Service) SendNotification(options NotificationOptions) error {
Title: options.Title,
Body: options.Body,
Priority: shout.Normal,
DefaultAction: "default",
DefaultAction: DefaultActionIdentifier,
}
if options.Data != nil {
jsonData, err := json.Marshal(options.Data)
if err == nil {
notification.DefaultActionTarget = dbus.MakeVariant(string(jsonData))
notification.DefaultActionTarget = dbus.MakeVariant(base64.StdEncoding.EncodeToString(jsonData))
}
}
@ -141,13 +143,13 @@ func (ns *Service) SendNotificationWithActions(options NotificationOptions) erro
Title: options.Title,
Body: options.Body,
Priority: shout.Normal,
DefaultAction: "default",
DefaultAction: DefaultActionIdentifier,
}
if options.Data != nil {
jsonData, err := json.Marshal(options.Data)
if err == nil {
notification.DefaultActionTarget = dbus.MakeVariant(string(jsonData))
notification.DefaultActionTarget = dbus.MakeVariant(base64.StdEncoding.EncodeToString(jsonData))
}
}
@ -162,8 +164,8 @@ func (ns *Service) SendNotificationWithActions(options NotificationOptions) erro
if options.Data != nil {
jsonData, err := json.Marshal(options.Data)
if err == nil {
for i := range notification.Buttons {
notification.Buttons[i].Target = string(jsonData)
for index := range notification.Buttons {
notification.Buttons[index].Target = string(jsonData)
}
}
}
@ -223,8 +225,6 @@ func getConfigFilePath() (string, error) {
return "", fmt.Errorf("failed to get user config directory: %v", err)
}
appName := "Wails Application"
appConfigDir := filepath.Join(configDir, appName)
if err := os.MkdirAll(appConfigDir, 0755); err != nil {
return "", fmt.Errorf("failed to create config directory: %v", err)

3
v3/pkg/services/notifications/notifications_windows.go
View file

@ -61,9 +61,8 @@ func (ns *Service) ServiceStartup(ctx context.Context, options application.Servi
}
if userInfo != "" {
jsonStr := strings.ReplaceAll(userInfo, "'", "\"")
var userInfoMap map[string]interface{}
if err := json.Unmarshal([]byte(jsonStr), &userInfoMap); err == nil {
if err := json.Unmarshal([]byte(userInfo), &userInfoMap); err == nil {
response.UserInfo = userInfoMap
}
}