cwtch.im
/
libcwtch-go
Archived
3
0
Fork 1
Code Issues 2 Pull Requests Releases 26 Wiki Activity

adding support for settings for notification policy and content, per convo opt in/outs, and attaching relevant info to messages

This commit is contained in:
Dan Ballard 2022-02-04 16:25:06 -05:00
parent 17acc3b8ef
commit e5e4d21fa0
7 changed files with 73 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
constants/attributes.go
View File

@ -18,6 +18,9 @@ const PeerOnline = "peer-online"
// Description is used on server contacts,
const Description = "description"
const NotificationOptIn = "notification-opt-in"
const NotificationOptOut = "notification-opt-out"
const StateProfilePane = "state-profile-pane"
const StateSelectedConversation = "state-selected-conversation"
const StateSelectedProfileTime = "state-selected-profile-time"

9
constants/globals.go
View File

@ -11,3 +11,12 @@ const (
// StatusError is an event response for event.Status signifying a call failed in error, ideally accompanied by a event.Error
StatusError = "error"
)
const (
// NotificationNone enum for message["notification"] that means no notification
NotificationNone = "None"
// NotificationEvent enum for message["notification"] that means emit a notification that a message event happened only
NotificationEvent = "SimpleEvent"
// NotificationConversation enum for message["notification"] that means emit a notification event with Conversation handle included
NotificationConversation = "ContactInfo"
)

1
go.sum
View File

@ -274,7 +274,6 @@ golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHl
golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 h1:4+4C/Iv2U4fMZBiMCc98MG1In4gJY5YRhtpDNeDeHWs=
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=

31
utils/contacts.go
View File

@ -1,19 +1,20 @@
package utils
type Contact struct {
Name string `json:"name"`
Onion string `json:"onion"`
Status string `json:"status"`
Picture string `json:"picture"`
DefaultPicture string `json:"defaultPicture"`
Accepted bool `json:"accepted"`
Blocked bool `json:"blocked"`
SaveHistory string `json:"saveConversationHistory"`
Messages int `json:"numMessages"`
Unread int `json:"numUnread"`
LastMessage string `json:"lastMsgTime"`
IsGroup bool `json:"isGroup"`
GroupServer string `json:"groupServer"`
IsArchived bool `json:"isArchived"`
Identifier int `json:"identifier"`
Name string `json:"name"`
Onion string `json:"onion"`
Status string `json:"status"`
Picture string `json:"picture"`
DefaultPicture string `json:"defaultPicture"`
Accepted bool `json:"accepted"`
Blocked bool `json:"blocked"`
SaveHistory string `json:"saveConversationHistory"`
Messages int `json:"numMessages"`
Unread int `json:"numUnread"`
LastMessage string `json:"lastMsgTime"`
IsGroup bool `json:"isGroup"`
GroupServer string `json:"groupServer"`
IsArchived bool `json:"isArchived"`
Identifier int `json:"identifier"`
Options map[string]string `json:"options"`
}

12
utils/eventHandler.go
View File

@ -220,6 +220,14 @@ func (eh *EventHandler) handleAppBusEvent(e *event.Event) string {
lastMessage, _ := profile.GetMostRecentMessages(conversationInfo.ID, 0, 0, 1)
options := make(map[string]string)
if notificationOptIn, exists := conversationInfo.GetAttribute(attr.LocalScope, attr.ProfileZone, constants2.NotificationOptIn); exists {
options[constants2.NotificationOptIn] = notificationOptIn
}
if notificationOptOut, exists := conversationInfo.GetAttribute(attr.LocalScope, attr.ProfileZone, constants2.NotificationOptOut); exists {
options[constants2.NotificationOptOut] = notificationOptOut
}
contacts = append(contacts, Contact{
Name: name,
Identifier: conversationInfo.ID,
@ -236,6 +244,7 @@ func (eh *EventHandler) handleAppBusEvent(e *event.Event) string {
IsGroup: conversationInfo.IsGroup(),
GroupServer: groupServer,
IsArchived: isArchived == event.True,
Options: options,
})
}
}
@ -305,6 +314,8 @@ func (eh *EventHandler) handleProfileEvent(ev *EventProfileEnvelope) string {
if ci.Accepted {
handleImagePreviews(profile, &ev.Event, ci.ID, ci.ID)
}
ev.Event.Data["notification"] = determineNotification(ci)
case event.NewMessageFromGroup:
// only needs contact nickname and picture, for displaying on popup notifications
ci, err := profile.FetchConversationInfo(ev.Event.Data["RemotePeer"])
@ -327,6 +338,7 @@ func (eh *EventHandler) handleProfileEvent(ev *EventProfileEnvelope) string {
if ci != nil && ci.Accepted {
handleImagePreviews(profile, &ev.Event, conversationID, ci.ID)
}
ev.Event.Data["notification"] = determineNotification(ci)
case event.PeerAcknowledgement:
ci, err := profile.FetchConversationInfo(ev.Event.Data["RemotePeer"])
if ci != nil && err == nil {

4
utils/settings.go
View File

@ -34,6 +34,8 @@ type GlobalSettings struct {
ExperimentsEnabled bool
Experiments map[string]bool
BlockUnknownConnections bool
NotificationPolicy string
NotificationContent string
StreamerMode bool
StateRootPane int
FirstTime bool
@ -62,6 +64,8 @@ var DefaultGlobalSettings = GlobalSettings{
StreamerMode: false,
UIColumnModePortrait: "DualpaneMode.Single",
UIColumnModeLandscape: "DualpaneMode.CopyPortrait",
NotificationPolicy: "NotificationPolicy.OptOut",
NotificationContent: "NotificationContent.SimpleEvent",
DownloadPath: "",
AllowAdvancedTorConfig: false,
CustomTorrc: "",

29
utils/utils.go
View File

@ -1,8 +1,11 @@
package utils
import (
"cwtch.im/cwtch/model"
"cwtch.im/cwtch/model/attr"
"encoding/base32"
"encoding/hex"
"git.openprivacy.ca/cwtch.im/libcwtch-go/constants"
"git.openprivacy.ca/openprivacy/log"
"strings"
)
@ -27,3 +30,29 @@ func RandomGroupImage(handle string) string {
}
return "assets/servers/" + choices[int(barr[0])%len(choices)] + ".png"
}
func determineNotification(ci *model.Conversation) string {
settings := ReadGlobalSettings()
switch settings.NotificationPolicy {
case "NotificationPolicy.None":
return constants.NotificationNone
case "NotificationPolicy.OptOut":
if optOut, exists := ci.GetAttribute(attr.LocalScope, attr.ProfileZone, constants.NotificationOptOut); exists && optOut == "true" {
return constants.NotificationNone
}
if settings.NotificationContent == "NotificationContent.ContactInfo" {
return constants.NotificationConversation
}
return constants.NotificationEvent
case "NotificationPolicy.OptIn":
if optIn, exists := ci.GetAttribute(attr.LocalScope, attr.ProfileZone, constants.NotificationOptIn); exists && optIn == "true" {
if settings.NotificationContent == "NotificationContent.ContactInfo" {
return constants.NotificationConversation
}
return constants.NotificationEvent
}
return constants.NotificationNone
}
return constants.NotificationNone
}