From bbd6748d0683adea6f9732bee2f4d8835c43d596 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Fri, 5 Nov 2021 16:40:42 -0700 Subject: [PATCH 1/2] on server import, connect --- features/groups/group_functionality.go | 4 +++- go.mod | 4 ++-- go.sum | 10 ++-------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/features/groups/group_functionality.go b/features/groups/group_functionality.go index 4620ac2..dab47b4 100644 --- a/features/groups/group_functionality.go +++ b/features/groups/group_functionality.go @@ -105,9 +105,11 @@ func (gf *GroupFunctionality) HandleImportString(peer peer.CwtchPeer, importStri // Server Key Bundles are prefixed with bundle, err := base64.StdEncoding.DecodeString(importString[len(serverPrefix):]) if err == nil { - if err = peer.AddServer(string(bundle)); err != nil { + serverOnion, err := peer.AddServer(string(bundle)) + if err != nil { return features.ConstructResponse(importBundlePrefix, err.Error()) } + peer.JoinServer(serverOnion) return features.ConstructResponse(importBundlePrefix, "success") } return features.ConstructResponse(importBundlePrefix, err.Error()) diff --git a/go.mod b/go.mod index 3a7b799..f0ecfaa 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,11 @@ module git.openprivacy.ca/cwtch.im/libcwtch-go go 1.15 require ( - cwtch.im/cwtch v0.13.2 + cwtch.im/cwtch v0.13.3 git.openprivacy.ca/cwtch.im/server v1.3.3 git.openprivacy.ca/openprivacy/connectivity v1.5.0 git.openprivacy.ca/openprivacy/log v1.0.3 golang.org/x/mobile v0.0.0-20210716004757-34ab1303b554 // indirect golang.org/x/mod v0.5.0 // indirect golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect -) +) \ No newline at end of file diff --git a/go.sum b/go.sum index b742616..b2b3a22 100644 --- a/go.sum +++ b/go.sum @@ -1,11 +1,5 @@ -cwtch.im/cwtch v0.12.2 h1:I+ndKadCRCITw4SPbd+1cpRv+z/7iHjjTUv8OzRwTrE= -cwtch.im/cwtch v0.12.2/go.mod h1:QpTkQK7MqNt0dQK9/pBk5VpkvFhy6xuoxJIn401B8fM= -cwtch.im/cwtch v0.13.0 h1:9WhLG9czfyRceZnHSqfTAq0vfmDC/E20mziJb9+Skrg= -cwtch.im/cwtch v0.13.0/go.mod h1:QpTkQK7MqNt0dQK9/pBk5VpkvFhy6xuoxJIn401B8fM= -cwtch.im/cwtch v0.13.1 h1:k7CDr16ZLZ+uaRtic2Joooc8TzkO7BkgWXs8r9ilqDY= -cwtch.im/cwtch v0.13.1/go.mod h1:QpTkQK7MqNt0dQK9/pBk5VpkvFhy6xuoxJIn401B8fM= -cwtch.im/cwtch v0.13.2 h1:qbKTQOUryvJpTzIf5iT49x6iAmeNxiz0doNb5phYVEQ= -cwtch.im/cwtch v0.13.2/go.mod h1:QpTkQK7MqNt0dQK9/pBk5VpkvFhy6xuoxJIn401B8fM= +cwtch.im/cwtch v0.13.3 h1:YMqb18msXmBW7gHAn2X/QgljoDag/HgWe6qdz9OgwlY= +cwtch.im/cwtch v0.13.3/go.mod h1:QpTkQK7MqNt0dQK9/pBk5VpkvFhy6xuoxJIn401B8fM= filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU= filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= git.openprivacy.ca/cwtch.im/server v1.3.1 h1:Kt4TnlGxGPk1KTjvs1cXtnFWDx+hYqu8w+2eIaqt+F4= From 3efc9543a4bc9c3fc408cd777f054fc108e48f9a Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Tue, 9 Nov 2021 15:08:00 -0800 Subject: [PATCH 2/2] servers bump to 1.3.4 (fix windows crash in monitors) --- go.mod | 4 ++-- go.sum | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index f0ecfaa..13592fa 100644 --- a/go.mod +++ b/go.mod @@ -4,10 +4,10 @@ go 1.15 require ( cwtch.im/cwtch v0.13.3 - git.openprivacy.ca/cwtch.im/server v1.3.3 + git.openprivacy.ca/cwtch.im/server v1.3.4 git.openprivacy.ca/openprivacy/connectivity v1.5.0 git.openprivacy.ca/openprivacy/log v1.0.3 golang.org/x/mobile v0.0.0-20210716004757-34ab1303b554 // indirect golang.org/x/mod v0.5.0 // indirect golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect -) \ No newline at end of file +) diff --git a/go.sum b/go.sum index b2b3a22..4b1c311 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,4 @@ +cwtch.im/cwtch v0.12.2/go.mod h1:QpTkQK7MqNt0dQK9/pBk5VpkvFhy6xuoxJIn401B8fM= cwtch.im/cwtch v0.13.3 h1:YMqb18msXmBW7gHAn2X/QgljoDag/HgWe6qdz9OgwlY= cwtch.im/cwtch v0.13.3/go.mod h1:QpTkQK7MqNt0dQK9/pBk5VpkvFhy6xuoxJIn401B8fM= filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU= @@ -8,6 +9,8 @@ git.openprivacy.ca/cwtch.im/server v1.3.2 h1:dUNMM88IWER6cmgCfhekahkef7laH597hqT git.openprivacy.ca/cwtch.im/server v1.3.2/go.mod h1:gps6glXDt/ra66Do491csrm0TwatAc2lMLOAKCkh5Vw= git.openprivacy.ca/cwtch.im/server v1.3.3 h1:LhHXlFAKzl2zM6Jd2Z3w3qMZM3UnRUA0qXWrlRBvKv8= git.openprivacy.ca/cwtch.im/server v1.3.3/go.mod h1:gps6glXDt/ra66Do491csrm0TwatAc2lMLOAKCkh5Vw= +git.openprivacy.ca/cwtch.im/server v1.3.4 h1:l/iK1/PO2fZfhrTLL4FKi2ROT01etaY4YXMnqQ+eH90= +git.openprivacy.ca/cwtch.im/server v1.3.4/go.mod h1:gps6glXDt/ra66Do491csrm0TwatAc2lMLOAKCkh5Vw= git.openprivacy.ca/cwtch.im/tapir v0.4.9 h1:LXonlztwvI1F1++0IyomIcDH1/Bxzo+oN8YjGonNvjM= git.openprivacy.ca/cwtch.im/tapir v0.4.9/go.mod h1:p4bHo3DAO8wwimU6JAeZXbfPQ4jnoA2bV+4YvknWTNQ= git.openprivacy.ca/openprivacy/bine v0.0.4 h1:CO7EkGyz+jegZ4ap8g5NWRuDHA/56KKvGySR6OBPW+c=