Merge branch 'trunk' of git.openprivacy.ca:flutter/libcwtch-go into sendinvite
continuous-integration/drone/pr Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
This commit is contained in:
commit
33c42f32d2
|
@ -47,19 +47,16 @@ func ExperimentGate(experimentMap map[string]bool) (*GroupFunctionality, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
// SendMessage is a deprecated api
|
// SendMessage is a deprecated api
|
||||||
func (gf *GroupFunctionality) SendMessage(peer peer.CwtchPeer, handle string, message string) error {
|
func (gf *GroupFunctionality) SendMessage(peer peer.CwtchPeer, handle string, message string) (string, error) {
|
||||||
// TODO this auto accepting behaviour needs some thinking through
|
// TODO this auto accepting behaviour needs some thinking through
|
||||||
if !peer.GetGroup(handle).Accepted {
|
if !peer.GetGroup(handle).Accepted {
|
||||||
err := peer.AcceptInvite(handle)
|
err := peer.AcceptInvite(handle)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Errorf("tried to mark a nonexistent group as existed. bad!")
|
log.Errorf("tried to mark a nonexistent group as existed. bad!")
|
||||||
return err
|
return "", err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return peer.SendMessageToGroupTracked(handle, message)
|
||||||
_, err := peer.SendMessageToGroupTracked(handle, message)
|
|
||||||
|
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ValidPrefix returns true if an import string contains a prefix that indicates it contains information about a
|
// ValidPrefix returns true if an import string contains a prefix that indicates it contains information about a
|
||||||
|
|
2
go.mod
2
go.mod
|
@ -3,7 +3,7 @@ module git.openprivacy.ca/flutter/libcwtch-go
|
||||||
go 1.15
|
go 1.15
|
||||||
|
|
||||||
require (
|
require (
|
||||||
cwtch.im/cwtch v0.7.1
|
cwtch.im/cwtch v0.7.6
|
||||||
git.openprivacy.ca/openprivacy/connectivity v1.4.3
|
git.openprivacy.ca/openprivacy/connectivity v1.4.3
|
||||||
git.openprivacy.ca/openprivacy/log v1.0.2
|
git.openprivacy.ca/openprivacy/log v1.0.2
|
||||||
golang.org/x/mobile v0.0.0-20210220033013-bdb1ca9a1e08 // indirect
|
golang.org/x/mobile v0.0.0-20210220033013-bdb1ca9a1e08 // indirect
|
||||||
|
|
6
go.sum
6
go.sum
|
@ -26,6 +26,12 @@ cwtch.im/cwtch v0.7.0 h1:iBAPk2h9onxAoUAqTpr4w9HHTD8thQrufKEgk7Uwekw=
|
||||||
cwtch.im/cwtch v0.7.0/go.mod h1:CVgA/YFG1BUlGLqgxOLgCfYQayquw7D0c25VIK4ZCog=
|
cwtch.im/cwtch v0.7.0/go.mod h1:CVgA/YFG1BUlGLqgxOLgCfYQayquw7D0c25VIK4ZCog=
|
||||||
cwtch.im/cwtch v0.7.1 h1:H+/LWucU2TO6j+reMcf7CJcU6s+qq0FlxdZWEOxTvNo=
|
cwtch.im/cwtch v0.7.1 h1:H+/LWucU2TO6j+reMcf7CJcU6s+qq0FlxdZWEOxTvNo=
|
||||||
cwtch.im/cwtch v0.7.1/go.mod h1:S0JRLSTwFM+kRrpOPKgUQn/loKe/fc6lLDnOFopRKq8=
|
cwtch.im/cwtch v0.7.1/go.mod h1:S0JRLSTwFM+kRrpOPKgUQn/loKe/fc6lLDnOFopRKq8=
|
||||||
|
cwtch.im/cwtch v0.7.4 h1:8XdTe0zzI6yUV6DaLcDp/OZvFRTlSD+SelKc2Ys2APU=
|
||||||
|
cwtch.im/cwtch v0.7.4/go.mod h1:S0JRLSTwFM+kRrpOPKgUQn/loKe/fc6lLDnOFopRKq8=
|
||||||
|
cwtch.im/cwtch v0.7.5 h1:Ab0XUGWUVUP0WWXT6AsPwWrUaOuM1RmNiw+6AGYsfdk=
|
||||||
|
cwtch.im/cwtch v0.7.5/go.mod h1:S0JRLSTwFM+kRrpOPKgUQn/loKe/fc6lLDnOFopRKq8=
|
||||||
|
cwtch.im/cwtch v0.7.6 h1:dEj9vtk9gv7Fwc7ru6ir/mZLSEnqBU1Pr0on/xyUdKE=
|
||||||
|
cwtch.im/cwtch v0.7.6/go.mod h1:S0JRLSTwFM+kRrpOPKgUQn/loKe/fc6lLDnOFopRKq8=
|
||||||
cwtch.im/tapir v0.2.1 h1:t1YJB9q5sV1A9xwiiwL6WVfw3dwQWLoecunuzT1PQtw=
|
cwtch.im/tapir v0.2.1 h1:t1YJB9q5sV1A9xwiiwL6WVfw3dwQWLoecunuzT1PQtw=
|
||||||
cwtch.im/tapir v0.2.1/go.mod h1:xzzZ28adyUXNkYL1YodcHsAiTt3IJ8Loc29YVn9mIEQ=
|
cwtch.im/tapir v0.2.1/go.mod h1:xzzZ28adyUXNkYL1YodcHsAiTt3IJ8Loc29YVn9mIEQ=
|
||||||
git.openprivacy.ca/cwtch.im/tapir v0.3.2 h1:thLWqqY1LkirWFcy9Tg6NgWeYbvo9xBm+s2XVnCIvpY=
|
git.openprivacy.ca/cwtch.im/tapir v0.3.2 h1:thLWqqY1LkirWFcy9Tg6NgWeYbvo9xBm+s2XVnCIvpY=
|
||||||
|
|
1
lib.go
1
lib.go
|
@ -106,6 +106,7 @@ func StartCwtch(appDir string, torPath string) {
|
||||||
event.NewGroupInvite,
|
event.NewGroupInvite,
|
||||||
event.ServerStateChange,
|
event.ServerStateChange,
|
||||||
event.ProtocolEngineStopped,
|
event.ProtocolEngineStopped,
|
||||||
|
event.RetryServerRequest,
|
||||||
}
|
}
|
||||||
settings := utils.ReadGlobalSettings()
|
settings := utils.ReadGlobalSettings()
|
||||||
settingsJson, _ := json.Marshal(settings)
|
settingsJson, _ := json.Marshal(settings)
|
||||||
|
|
Loading…
Reference in New Issue