From 3c539016aea1efdcd7d58517342b82a910daf7da Mon Sep 17 00:00:00 2001
From: jubb <hjubb@users.noreply.github.com>
Date: Thu, 4 Feb 2021 16:43:21 +1100
Subject: [PATCH] feat: add config message to protobuf and deprecate sync
 messages

---
 libsignal/protobuf/SignalService.proto | 46 +++++++++++++++++---------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/libsignal/protobuf/SignalService.proto b/libsignal/protobuf/SignalService.proto
index 050db80ae0..a62fa18220 100644
--- a/libsignal/protobuf/SignalService.proto
+++ b/libsignal/protobuf/SignalService.proto
@@ -35,14 +35,15 @@ message Envelope {
 }
 
 message Content {
-  optional DataMessage         dataMessage         = 1;
-  optional SyncMessage         syncMessage         = 2;
-  optional CallMessage         callMessage         = 3;
-  optional NullMessage         nullMessage         = 4;
-  optional ReceiptMessage      receiptMessage      = 5;
-  optional TypingMessage       typingMessage       = 6;
-  optional PreKeyBundleMessage preKeyBundleMessage = 101; // Loki
-  optional DeviceLinkMessage   deviceLinkMessage   = 103; // Loki
+  optional DataMessage          dataMessage           = 1;
+  optional SyncMessage          syncMessage           = 2 [deprecated=true];
+  optional CallMessage          callMessage           = 3;
+  optional NullMessage          nullMessage           = 4;
+  optional ReceiptMessage       receiptMessage        = 5;
+  optional TypingMessage        typingMessage         = 6;
+  optional ConfigurationMessage configurationMessage  = 7;
+  optional PreKeyBundleMessage  preKeyBundleMessage   = 101; // Loki
+  optional DeviceLinkMessage    deviceLinkMessage     = 103; // Loki
 }
 
 message DeviceLinkMessage {
@@ -217,6 +218,7 @@ message DataMessage {
   optional LokiUserProfile     profile             = 101; // Loki - The profile of the current user
   optional ClosedGroupUpdate   closedGroupUpdate   = 103; // Loki
   optional ClosedGroupUpdateV2 closedGroupUpdateV2 = 104;
+  optional string              syncTarget          = 105;
 }
 
 message LokiUserProfile {
@@ -236,13 +238,6 @@ message ClosedGroupUpdateV2 {
     MEMBER_LEFT         = 7;
   }
 
-  message KeyPair {
-    // @required
-    required bytes publicKey  = 1;
-    // @required
-    required bytes privateKey = 2;
-  }
-
   message KeyPairWrapper {
     // @required
     required bytes publicKey        = 1; // The public key of the user the key pair is meant for
@@ -260,6 +255,13 @@ message ClosedGroupUpdateV2 {
   repeated KeyPairWrapper wrappers          = 7;
 }
 
+message KeyPair {
+  // @required
+  required bytes publicKey  = 1;
+  // @required
+  required bytes privateKey = 2;
+}
+
 message ClosedGroupUpdate {
 
   enum Type {
@@ -314,6 +316,20 @@ message TypingMessage {
     optional bytes  groupId   = 3;
 }
 
+message ConfigurationMessage {
+
+  message ClosedGroup {
+    optional bytes   publicKey         = 1;
+    optional string  name              = 2;
+    optional KeyPair encryptionKeyPair = 3;
+    repeated bytes   members           = 4;
+    repeated bytes   admins            = 5;
+  }
+
+  repeated ClosedGroup closedGroups = 1;
+  repeated string      openGroups   = 2;
+}
+
 message Verified {
   enum State {
     DEFAULT    = 0;