wip image previews

This commit is contained in:
erinn 2021-12-14 13:23:32 -08:00
parent 7f5d466d49
commit 1b0333d468
2 changed files with 46 additions and 6 deletions

View File

@ -1,20 +1,24 @@
package utils
import (
"encoding/json"
"strconv"
"strings"
"cwtch.im/cwtch/app"
"cwtch.im/cwtch/app/plugins"
"cwtch.im/cwtch/model"
"cwtch.im/cwtch/model/attr"
"cwtch.im/cwtch/model/constants"
"cwtch.im/cwtch/protocol/connections"
"encoding/json"
constants2 "git.openprivacy.ca/cwtch.im/libcwtch-go/constants"
"git.openprivacy.ca/cwtch.im/libcwtch-go/features/groups"
"git.openprivacy.ca/cwtch.im/libcwtch-go/features/servers"
"git.openprivacy.ca/openprivacy/log"
"strconv"
"cwtch.im/cwtch/event"
"cwtch.im/cwtch/functionality/filesharing"
)
import "cwtch.im/cwtch/event"
type EventProfileEnvelope struct {
Event event.Event
@ -262,6 +266,37 @@ func (eh *EventHandler) handleProfileEvent(ev *EventProfileEnvelope) string {
ev.Event.Data["Nick"] = ph.GetNick(ev.Event.Data["RemotePeer"])
ev.Event.Data["Picture"] = ph.GetProfilePic(ev.Event.Data["RemotePeer"])
peer.SetContactAttribute(ev.Event.Data["RemotePeer"], attr.GetLocalScope(constants2.Archived), event.False)
fh, err := filesharing.PreviewFunctionalityGate(ReadGlobalSettings().Experiments)
if err == nil {
var cm model.MessageWrapper
err := json.Unmarshal([]byte(ev.Event.Data[event.Data]), &cm)
if err == nil && cm.Overlay == model.OverlayFileSharing {
var fm filesharing.OverlayMessage
log.Debugf("parsing: %v", cm.Data)
err = json.Unmarshal([]byte(cm.Data), &fm)
if err == nil {
lname := strings.ToLower(fm.Name)
if strings.HasSuffix(lname, "jpg") || strings.HasSuffix(lname, "jpeg") || strings.HasSuffix(lname, "png") || strings.HasSuffix(lname, "gif") || strings.HasSuffix(lname, "webp") || strings.HasSuffix(lname, "bmp") {
settings := ReadGlobalSettings()
basepath := settings.DownloadPath
//todo: security
fp, mp := filesharing.GenerateDownloadPath(basepath, fm.Name)
log.Debugf("NMFP: autodownloading file!!!")
log.Debugf("%v | %v | %v | %v | %v | %v", basepath, fm.Name, fp, mp, fm.FileKey(), fm)
fh.DownloadFile(peer, ev.Event.Data[event.RemotePeer], fp, mp, fm.FileKey())
} else {
log.Debugf("NMFP: suffix not jpg/jpeg/png")
}
} else {
log.Debugf("NMFP: not a file overlay message")
}
} else {
log.Debugf("NMFP: not a message wrapper")
}
} else {
log.Debugf("NMFP: file experiment is off")
}
case event.NewMessageFromGroup:
// only needs contact nickname and picture, for displaying on popup notifications
ev.Event.Data["Nick"] = ph.GetNick(ev.Event.Data[event.GroupID])

View File

@ -1,15 +1,17 @@
package utils
import (
"cwtch.im/cwtch/event"
"cwtch.im/cwtch/storage/v1"
"sync"
"cwtch.im/cwtch/event"
"cwtch.im/cwtch/storage/v1"
"encoding/json"
"git.openprivacy.ca/openprivacy/log"
"io/ioutil"
"os"
"path"
"git.openprivacy.ca/openprivacy/log"
)
const (
@ -36,6 +38,7 @@ type GlobalSettings struct {
FirstTime bool
UIColumnModePortrait string
UIColumnModeLandscape string
DownloadPath string
}
var DefaultGlobalSettings = GlobalSettings{
@ -50,6 +53,7 @@ var DefaultGlobalSettings = GlobalSettings{
StreamerMode: false,
UIColumnModePortrait: "DualpaneMode.Single",
UIColumnModeLandscape: "DualpaneMode.CopyPortrait",
DownloadPath: "",
}
func InitGlobalSettingsFile(directory string, password string) error {
@ -111,6 +115,7 @@ func WriteGlobalSettings(globalSettings GlobalSettings) {
lock.Lock()
defer lock.Unlock()
bytes, _ := json.Marshal(globalSettings)
log.Debugf("writing settings: %v", string(bytes))
// override first time setting
globalSettings.FirstTime = true
err := GlobalSettingsFile.Write(bytes)