fix SIGNALD_DATABASE env name

.gitlab-ci.yml

@@ -62,22 +62,27 @@ test sqlite to postgres:
 .build-deb:
   stage: build
   image: debian:buster
-  before_script:
+  script:
     - echo deb http://deb.debian.org/debian buster-backports main > /etc/apt/sources.list.d/backports.list
     - apt-get update
-    - apt-get install -y -t buster-backports git-buildpackage dh-golang bash-completion golang-any golang-github-spf13-cobra-dev golang-github-spf13-viper-dev golang-github-google-uuid-dev golang-github-mattn-go-sqlite3-dev golang-github-lib-pq-dev golang-github-satori-go.uuid-dev wget unzip
+    - apt-get install -y -t buster-backports git-buildpackage dh-golang bash-completion golang-any golang-github-spf13-cobra-dev golang-github-spf13-viper-dev golang-github-google-uuid-dev golang-github-mattn-go-sqlite3-dev golang-github-lib-pq-dev golang-github-satori-go.uuid-dev
-    - wget -O golang-github-mdp-qrterminal.zip --quiet "https://gitlab.com/api/v4/projects/signald%2Flibraries%2Fgolang-github-mdp-qrterminal/jobs/artifacts/master/download?job=build"
-    - wget -O golang-github-jedib0t-go-pretty.zip --quiet "https://gitlab.com/api/v4/projects/signald%2Flibraries%2Fgolang-github-jedib0t-go-pretty/jobs/artifacts/master/download?job=build"
-    - for z in *.zip; do unzip $z; done
     - apt-get install -y ./*.deb && rm -vf *.deb
-  script:
     - 'sed -i "s/^Architecture:.*/Architecture: ${ARCH}/g" debian/control'
     - go run ./cmd/signaldctl doc -o man
     - go run ./cmd/signaldctl completion bash > debian/package.bash-completion
     - ls *.1 > debian/manpages
-    - gbp dch --ignore-branch --debian-tag="%(version)s" --git-author --new-version="$(./version.sh | cut -c2-)"
+    - gbp dch --ignore-branch --debian-tag="%(version)s" --git-author --new-version="$(./version.sh)"
     - dpkg-buildpackage -us -uc -b
     - mv ../*.deb .
+  needs:
+  - project: signald/libraries/golang-github-mdp-qrterminal
+    job: build
+    ref: master
+    artifacts: true
+  - project: signald/libraries/golang-github-jedib0t-go-pretty
+    job: build
+    ref: master
+    artifacts: true
   variables:
     SIGNALDCTL_PUBLIC_DOC_MODE: "on"
   artifacts:

cmd/signaldctl/cmd/account/link/link-account.go

@@ -34,7 +34,6 @@ import (
 var (
 	testing    bool
 	deviceName string
-	overwrite  bool
 
 	LinkAccountCmd = &cobra.Command{
 		Use:   "link",
@@ -81,7 +80,6 @@ var (
 			finishReq := v1.FinishLinkRequest{
 				DeviceName: deviceName,
 				SessionId:  response.SessionId,
-				Overwrite:  overwrite,
 			}
 
 			_, err = finishReq.Submit(common.Signald)
@@ -101,5 +99,4 @@ func init() {
 	}
 	LinkAccountCmd.Flags().BoolVarP(&testing, "testing", "t", false, "use the Signal testing server")
 	LinkAccountCmd.Flags().StringVarP(&deviceName, "device-name", "n", name, "the name of this device. shown to other devices on the signal account")
-	LinkAccountCmd.Flags().BoolVar(&overwrite, "overwrite", false, "if an account with the same id already exists in signald's database, delete it before linking")
 }

cmd/signaldctl/cmd/account/setprofile/set-profile.go

@@ -27,14 +27,10 @@ import (
 
 var (
 	account string
-	name    string
-	avatar  string
-	emoji   string
-	about   string
 
 	SetProfileCmd = &cobra.Command{
-		Use:   "set-profile [name]",
+		Use:   "set-profile name",
-		Short: "update an account's profile data",
+		Short: "updates the profile data with a new name",
 		PreRun: func(cmd *cobra.Command, args []string) {
 			if account == "" {
 				account = config.Config.DefaultAccount
@@ -43,19 +39,16 @@ var (
 				common.Must(cmd.Help())
 				log.Fatal("No account specified. Please specify with --account or set a default")
 			}
-
+			if len(args) != 1 {
-			if len(args) > 0 {
+				common.Must(cmd.Help())
-				name = args[0]
+				log.Fatal("must specify a name")
 			}
 		},
-		Run: func(_ *cobra.Command, _ []string) {
+		Run: func(_ *cobra.Command, args []string) {
 			go common.Signald.Listen(nil)
 			req := v1.SetProfile{
 				Account: account,
-				Name:       name,
+				Name:    args[0],
-				AvatarFile: avatar,
-				Emoji:      emoji,
-				About:      about,
 			}
 			err := req.Submit(common.Signald)
 			if err != nil {
@@ -68,7 +61,4 @@ var (
 
 func init() {
 	SetProfileCmd.Flags().StringVarP(&account, "account", "a", "", "the signald account to use")
-	SetProfileCmd.Flags().StringVarP(&avatar, "avatar", "A", "", "path to avatar file")
-	SetProfileCmd.Flags().StringVar(&emoji, "emoji", "", "an emoji to be shown next to the about section")
-	SetProfileCmd.Flags().StringVar(&about, "about", "", "profile about section")
 }

cmd/signaldctl/cmd/db/migrate.go

@@ -32,8 +32,6 @@ var (
 		{InstalledRank: 3, Version: "13", Description: "recipient registration status", Script: "V13__recipient_registration_status.sql", Checksum: 405376321},
 		{InstalledRank: 4, Version: "14", Description: "multiple identity keys per account", Script: "V14__multiple_identity_keys_per_account.sql", Checksum: -1635788950},
 		{InstalledRank: 5, Version: "15", Description: "profiles tables", Script: "V15__profiles_tables.sql", Checksum: 809686180},
-		{InstalledRank: 6, Version: "16", Description: "destination uuid in envelope", Script: "V16__destination_uuid_in_envelope.sql", Checksum: 357656854},
-		{InstalledRank: 7, Version: "17", Description: "update server ca", Script: "V17__update_server_ca.sql", Checksum: 1647934070},
 	}
 
 	sqlitePath  string
@@ -61,7 +59,7 @@ var (
 			}
 			return nil
 		},
-		RunE: func(cmd *cobra.Command, args []string) (err error) {
+		RunE: func(cmd *cobra.Command, args []string) error {
 			source, err := sql.Open("sqlite3", sqlitePath)
 			if err != nil {
 				return err
@@ -94,37 +92,107 @@ var (
 			}
 			log.Println("created schema")
 
-			migrate := func(fn func(*sql.DB, *sql.DB) error, targetName string) {
+			if err := moveAccounts(source, dest); err != nil {
-				if err = fn(source, dest); err != nil {
+				log.Println("error moving accounts table")
-					log.Println("error moving", targetName)
+				return err
-					panic(err)
 			}
-				log.Println("moved", targetName)
+			log.Println("moved accounts table")
-			}
-			defer func() {
-				if r := recover(); r != nil && r != err {
-					// If r is something other than the error returned via the named return, re-panic it
-					panic(r)
-				}
-			}()
 
-			migrate(moveAccounts, "accounts table")
+			if err := moveRecipients(source, dest); err != nil {
-			migrate(moveRecipients, "recipients table")
+				log.Println("error moving recipients table")
-			migrate(movePrekeys, "prekeys table")
+				return err
-			migrate(moveSessions, "sessions table")
+			}
-			migrate(moveSignedPrekeys, "signed prekeys table")
+			log.Println("moved recipients table")
-			migrate(moveIdentityKeys, "identity keys table")
+
-			migrate(moveAccountData, "account data")
+			if err := movePrekeys(source, dest); err != nil {
-			migrate(movePendingAccountData, "pending account data table")
+				log.Println("error moving prekeys table")
-			migrate(moveSenderKeys, "sender keys table")
+				return err
-			migrate(moveSenderKeyShared, "sender key shared table")
+			}
-			migrate(moveGroups, "groups table")
+			log.Println("moved prekeys table")
-			migrate(moveGroupCredentials, "group credentials table")
+
-			migrate(moveContacts, "contacts table")
+			if err := moveSessions(source, dest); err != nil {
-			migrate(moveProfileKeys, "profile keys table")
+				log.Println("error moving sessions table")
-			migrate(moveProfiles, "profiles tables")
+				return err
-			migrate(moveProfileCapabilities, "profile capabilities tables")
+			}
-			migrate(moveProfileBadges, "profile badges tables")
+			log.Println("moved sessions table")
+
+			if err := moveSignedPrekeys(source, dest); err != nil {
+				log.Println("error moving signed prekeys table")
+				return err
+			}
+			log.Println("moved signed prekeys table")
+
+			if err := moveIdentityKeys(source, dest); err != nil {
+				log.Println("error moving identity keys table")
+				return err
+			}
+			log.Println("moved identity keys table")
+
+			if err := moveAccountData(source, dest); err != nil {
+				log.Println("error moving account data")
+				return err
+			}
+			log.Println("moved account data table")
+
+			if err := movePendingAccountData(source, dest); err != nil {
+				log.Println("error moving pending account data tabe")
+				return err
+			}
+			log.Println("moved pending account data table")
+
+			if err := moveSenderKeys(source, dest); err != nil {
+				log.Println("error moving sender keys table")
+				return err
+			}
+			log.Println("moved sender keys table")
+
+			if err := moveSenderKeyShared(source, dest); err != nil {
+				log.Println("error moving sender key shared table")
+				return err
+			}
+			log.Println("moved sender key shared table")
+
+			if err := moveGroups(source, dest); err != nil {
+				log.Println("error moving groups table")
+				return err
+			}
+			log.Println("moved groups table")
+
+			if err := moveGroupCredentials(source, dest); err != nil {
+				log.Println("error moving group credentials table")
+				return err
+			}
+			log.Println("moved group credentials table")
+
+			if err := moveContacts(source, dest); err != nil {
+				log.Println("error moving group credentials table")
+				return err
+			}
+			log.Println("moved contacts table")
+
+			if err := moveProfileKeys(source, dest); err != nil {
+				log.Println("error moving profile keys table")
+				return err
+			}
+			log.Println("moved profile keys table")
+
+			if err := moveProfiles(source, dest); err != nil {
+				log.Println("error moving profiles tables")
+				return err
+			}
+			log.Println("moved profiles tables")
+
+			if err := moveProfileCapabilities(source, dest); err != nil {
+				log.Println("error moving profile capabilities tables")
+				return err
+			}
+			log.Println("moved profile capabilities tables")
+
+			if err := moveProfileBadges(source, dest); err != nil {
+				log.Println("error moving profile badges tables")
+				return err
+			}
+			log.Println("moved profile badges tables")
 
 			if err := os.Remove(sqlitePath); err != nil {
 				log.Println("error deleting sqlite file")
@@ -201,7 +269,7 @@ func moveAccounts(source *sql.DB, dest *sql.DB) error {
 		if err != nil {
 			return err
 		}
-		_, err = dest.Exec("INSERT INTO signald_accounts (uuid, e164, server) VALUES ($1, $2, $3)", accountUUID, e164, server)
+		_, err = dest.Exec("INSERT INTO signald_accounts (uuid, e164, server) VALUES ($1, $2, $3, $4)", accountUUID, e164, server)
 		if err != nil {
 			return err
 		}
@@ -210,9 +278,7 @@ func moveAccounts(source *sql.DB, dest *sql.DB) error {
 }
 
 func moveRecipients(source *sql.DB, dest *sql.DB) error {
-	rows, err := source.Query("SELECT rowid, account_uuid, uuid, e164, registered FROM recipients" +
+	rows, err := source.Query("SELECT rowid, account_uuid, uuid, e164, registered FROM recipients")
-		" WHERE account_uuid IN (SELECT DISTINCT uuid FROM accounts)",
-	)
 	if err != nil {
 		return err
 	}
@@ -252,9 +318,7 @@ func moveRecipients(source *sql.DB, dest *sql.DB) error {
 }
 
 func movePrekeys(source *sql.DB, dest *sql.DB) error {
-	rows, err := source.Query("SELECT account_uuid, id, record FROM prekeys" +
+	rows, err := source.Query("SELECT account_uuid, id, record FROM prekeys")
-		" WHERE account_uuid IN (SELECT DISTINCT uuid FROM accounts)",
-	)
 	if err != nil {
 		return err
 	}
@@ -279,10 +343,7 @@ func movePrekeys(source *sql.DB, dest *sql.DB) error {
 }
 
 func moveSessions(source *sql.DB, dest *sql.DB) error {
-	rows, err := source.Query("SELECT account_uuid, recipient, device_id, record FROM sessions" +
+	rows, err := source.Query("SELECT account_uuid, recipient, device_id, record FROM sessions")
-		" WHERE account_uuid IN (SELECT DISTINCT uuid FROM accounts)" +
-		" AND   recipient IN (SELECT DISTINCT rowid FROM recipients)",
-	)
 	if err != nil {
 		return err
 	}
@@ -317,9 +378,7 @@ func moveSessions(source *sql.DB, dest *sql.DB) error {
 }
 
 func moveSignedPrekeys(source *sql.DB, dest *sql.DB) error {
-	rows, err := source.Query("SELECT account_uuid, id, record FROM signed_prekeys" +
+	rows, err := source.Query("SELECT account_uuid, id, record FROM signed_prekeys")
-		" WHERE account_uuid IN (SELECT DISTINCT uuid FROM accounts)",
-	)
 	if err != nil {
 		return err
 	}
@@ -344,9 +403,7 @@ func moveSignedPrekeys(source *sql.DB, dest *sql.DB) error {
 }
 
 func moveIdentityKeys(source *sql.DB, dest *sql.DB) error {
-	rows, err := source.Query("SELECT account_uuid, recipient, identity_key, trust_level, added FROM identity_keys" +
+	rows, err := source.Query("SELECT account_uuid, recipient, identity_key, trust_level, added FROM identity_keys")
-		" WHERE account_uuid IN (SELECT DISTINCT uuid FROM accounts)",
-	)
 	if err != nil {
 		return err
 	}
@@ -373,9 +430,7 @@ func moveIdentityKeys(source *sql.DB, dest *sql.DB) error {
 }
 
 func moveAccountData(source *sql.DB, dest *sql.DB) error {
-	rows, err := source.Query("SELECT account_uuid, key, value FROM account_data" +
+	rows, err := source.Query("SELECT account_uuid, key, value FROM account_data")
-		" WHERE account_uuid IN (SELECT DISTINCT uuid FROM accounts)",
-	)
 	if err != nil {
 		return err
 	}
@@ -425,9 +480,7 @@ func movePendingAccountData(source *sql.DB, dest *sql.DB) error {
 }
 
 func moveSenderKeys(source *sql.DB, dest *sql.DB) error {
-	rows, err := source.Query("SELECT account_uuid, address, device, distribution_id, record, created_at FROM sender_keys" +
+	rows, err := source.Query("SELECT account_uuid, address, device, distribution_id, record, created_at FROM sender_keys")
-		" WHERE account_uuid IN (SELECT DISTINCT uuid FROM accounts)",
-	)
 	if err != nil {
 		return err
 	}
@@ -463,9 +516,7 @@ func moveSenderKeys(source *sql.DB, dest *sql.DB) error {
 }
 
 func moveSenderKeyShared(source *sql.DB, dest *sql.DB) error {
-	rows, err := source.Query("SELECT account_uuid, distribution_id, address, device FROM sender_key_shared" +
+	rows, err := source.Query("SELECT account_uuid, distribution_id, address, device FROM sender_key_shared")
-		" WHERE account_uuid IN (SELECT DISTINCT uuid FROM accounts)",
-	)
 	if err != nil {
 		return err
 	}
@@ -501,9 +552,7 @@ func moveSenderKeyShared(source *sql.DB, dest *sql.DB) error {
 }
 
 func moveGroups(source *sql.DB, dest *sql.DB) error {
-	rows, err := source.Query("SELECT rowid, account_uuid, group_id, master_key, revision, last_avatar_fetch, distribution_id, group_info FROM groups" +
+	rows, err := source.Query("SELECT rowid, account_uuid, group_id, master_key, revision, last_avatar_fetch, distribution_id, group_info FROM groups")
-		" WHERE account_uuid IN (SELECT DISTINCT uuid FROM accounts)",
-	)
 	if err != nil {
 		return err
 	}
@@ -539,10 +588,7 @@ func moveGroups(source *sql.DB, dest *sql.DB) error {
 }
 
 func moveGroupCredentials(source *sql.DB, dest *sql.DB) error {
-	rows, err := source.Query("SELECT account_uuid, date, max(credential) FROM group_credentials" +
+	rows, err := source.Query("SELECT account_uuid, date, credential FROM group_credentials")
-		" WHERE account_uuid IN (SELECT DISTINCT uuid FROM accounts)" +
-		" GROUP BY account_uuid, date",
-	)
 	if err != nil {
 		return err
 	}
@@ -567,10 +613,7 @@ func moveGroupCredentials(source *sql.DB, dest *sql.DB) error {
 }
 
 func moveContacts(source *sql.DB, dest *sql.DB) error {
-	rows, err := source.Query("SELECT account_uuid, recipient, name, color, profile_key, message_expiration_time, inbox_position FROM contacts" +
+	rows, err := source.Query("SELECT account_uuid, recipient, name, color, profile_key, message_expiration_time, inbox_position FROM contacts")
-		" WHERE account_uuid IN (SELECT DISTINCT uuid FROM accounts)" +
-		" AND   recipient IN (SELECT DISTINCT rowid FROM recipients)",
-	)
 	if err != nil {
 		return err
 	}
@@ -603,10 +646,7 @@ func moveContacts(source *sql.DB, dest *sql.DB) error {
 }
 
 func moveProfileKeys(source *sql.DB, dest *sql.DB) error {
-	rows, err := source.Query("SELECT account_uuid, recipient, profile_key, profile_key_credential, request_pending, unidentified_access_mode FROM profile_keys" +
+	rows, err := source.Query("SELECT account_uuid, recipient, profile_key, profile_key_credential, request_pending, unidentified_access_mode FROM profile_keys")
-		" WHERE account_uuid IN (SELECT DISTINCT uuid FROM accounts)" +
-		" AND   recipient IN (SELECT DISTINCT rowid FROM recipients)",
-	)
 	if err != nil {
 		return err
 	}
@@ -628,7 +668,7 @@ func moveProfileKeys(source *sql.DB, dest *sql.DB) error {
 		_, err = dest.Exec(`
             INSERT INTO signald_profile_keys
                         (account_uuid, recipient, profile_key, profile_key_credential, request_pending, unidentified_access_mode)
-                 VALUES ($1, $2, $3, $4, $5, $6)
+                 VALUES ($1, $2, $3, $4, $5, $6, $7)
         `, accountUUID, recipient, profile_key, profile_key_credential, request_pending, unidentified_access_mode)
 		if err != nil {
 			return err
@@ -638,10 +678,7 @@ func moveProfileKeys(source *sql.DB, dest *sql.DB) error {
 }
 
 func moveProfiles(source *sql.DB, dest *sql.DB) error {
-	rows, err := source.Query("SELECT account_uuid, recipient, last_update, given_name, family_name, about, emoji, payment_address, badges FROM profiles" +
+	rows, err := source.Query("SELECT account_uuid, recipient, last_update, given_name, family_name, about, emoji, payment_address, badges FROM profiles")
-		" WHERE account_uuid IN (SELECT DISTINCT uuid FROM accounts)" +
-		" AND   recipient IN (SELECT DISTINCT rowid FROM recipients)",
-	)
 	if err != nil {
 		return err
 	}
@@ -657,7 +694,7 @@ func moveProfiles(source *sql.DB, dest *sql.DB) error {
 			about           string
 			emoji           string
 			payment_address []byte
-			badges          sql.NullString
+			badges          string
 		)
 		err = rows.Scan(&accountUUID, &recipient, &last_update, &given_name, &family_name, &about, &emoji, &payment_address, &badges)
 		if err != nil {
@@ -676,10 +713,7 @@ func moveProfiles(source *sql.DB, dest *sql.DB) error {
 }
 
 func moveProfileCapabilities(source *sql.DB, dest *sql.DB) error {
-	rows, err := source.Query("SELECT account_uuid, recipient, storage, gv1_migration, sender_key, announcement_group, change_number, stories FROM profile_capabilities" +
+	rows, err := source.Query("SELECT account_uuid, recipient, storage, gv1_migration, sender_key, announcement_group, change_number, stories FROM profile_capabilities")
-		" WHERE account_uuid IN (SELECT DISTINCT uuid FROM accounts)" +
-		" AND   recipient IN (SELECT DISTINCT rowid FROM recipients)",
-	)
 	if err != nil {
 		return err
 	}
@@ -713,9 +747,7 @@ func moveProfileCapabilities(source *sql.DB, dest *sql.DB) error {
 }
 
 func moveProfileBadges(source *sql.DB, dest *sql.DB) error {
-	rows, err := source.Query("SELECT account_uuid, id, category, name, description, sprite6 FROM profile_badges" +
+	rows, err := source.Query("SELECT account_uuid, id, category, name, description, sprite6 FROM profile_badges")
-		" WHERE account_uuid IN (SELECT DISTINCT uuid FROM accounts)",
-	)
 	if err != nil {
 		return err
 	}

cmd/signaldctl/cmd/db/postgres.go

@@ -29,8 +29,7 @@ var (
 		legacy_message              BYTEA,
 		server_received_timestamp   BIGINT,
 		server_delivered_timestamp  BIGINT,
-		server_uuid                 UUID,
+		server_uuid                 UUID
-		destination_uuid            TEXT
 	);
 
 	CREATE TABLE signald_servers (

cmd/signaldctl/cmd/session/root.go

@@ -15,6 +15,7 @@
 
 package session
 
+
 import (
 	"github.com/spf13/cobra"
 )

signald/client-protocol/v0/structs.go

@@ -291,7 +291,6 @@ type OfferMessage struct {
 }
 
 type Optional struct {
-	Empty   bool `json:"empty,omitempty" yaml:"empty,omitempty"`
 	Present bool `json:"present,omitempty" yaml:"present,omitempty"`
 }
 

signald/client-protocol/v1/errors.go

@@ -81,13 +81,6 @@ func mkerr(response client_protocol.BasicResponse) error {
 			return err
 		}
 		return result
-	case "GroupPatchNotAcceptedError":
-		result := GroupPatchNotAcceptedError{}
-		err := json.Unmarshal(response.Error, &result)
-		if err != nil {
-			return err
-		}
-		return result
 	case "GroupVerificationError":
 		result := GroupVerificationError{}
 		err := json.Unmarshal(response.Error, &result)
@@ -214,13 +207,6 @@ func mkerr(response client_protocol.BasicResponse) error {
 			return err
 		}
 		return result
-	case "ProtocolInvalidKeyIdError":
-		result := ProtocolInvalidKeyIdError{}
-		err := json.Unmarshal(response.Error, &result)
-		if err != nil {
-			return err
-		}
-		return result
 	case "ProtocolInvalidMessageError":
 		result := ProtocolInvalidMessageError{}
 		err := json.Unmarshal(response.Error, &result)
@@ -228,13 +214,6 @@ func mkerr(response client_protocol.BasicResponse) error {
 			return err
 		}
 		return result
-	case "ProtocolNoSessionError":
-		result := ProtocolNoSessionError{}
-		err := json.Unmarshal(response.Error, &result)
-		if err != nil {
-			return err
-		}
-		return result
 	case "RateLimitError":
 		result := RateLimitError{}
 		err := json.Unmarshal(response.Error, &result)
@@ -242,13 +221,6 @@ func mkerr(response client_protocol.BasicResponse) error {
 			return err
 		}
 		return result
-	case "SQLError":
-		result := SQLError{}
-		err := json.Unmarshal(response.Error, &result)
-		if err != nil {
-			return err
-		}
-		return result
 	case "ScanTimeoutError":
 		result := ScanTimeoutError{}
 		err := json.Unmarshal(response.Error, &result)
@@ -284,13 +256,6 @@ func mkerr(response client_protocol.BasicResponse) error {
 			return err
 		}
 		return result
-	case "UnsupportedGroupError":
-		result := UnsupportedGroupError{}
-		err := json.Unmarshal(response.Error, &result)
-		if err != nil {
-			return err
-		}
-		return result
 	case "UntrustedIdentityError":
 		result := UntrustedIdentityError{}
 		err := json.Unmarshal(response.Error, &result)
@@ -344,7 +309,7 @@ func (e AttachmentTooLargeError) Error() string {
 	return e.Message
 }
 
-// AuthorizationFailedError: Indicates the server rejected our credentials or a failed group update. Typically means the linked device was removed by the primary device, or that the account was re-registered. For group updates, this can indicate that we lack permissions.
+// AuthorizationFailedError: indicates the server rejected our credentials. Typically means the linked device was removed by the primary device, or that the account was re-registered
 type AuthorizationFailedError struct {
 	Message string `json:"message,omitempty" yaml:"message,omitempty"`
 }
@@ -395,15 +360,6 @@ func (e GroupNotActiveError) Error() string {
 	return e.Message
 }
 
-// GroupPatchNotAcceptedError: Indicates the server rejected our group update. This can be due to errors such as trying to add a user that's already in the group.
-type GroupPatchNotAcceptedError struct {
-	Message string `json:"message,omitempty" yaml:"message,omitempty"`
-}
-
-func (e GroupPatchNotAcceptedError) Error() string {
-	return e.Message
-}
-
 type GroupVerificationError struct {
 	Message string `json:"message,omitempty" yaml:"message,omitempty"`
 }
@@ -555,19 +511,6 @@ func (e ProofRequiredError) Error() string {
 	return e.Message
 }
 
-type ProtocolInvalidKeyIdError struct {
-	ContentHint  int32  `json:"content_hint,omitempty" yaml:"content_hint,omitempty"`
-	GroupId      string `json:"group_id,omitempty" yaml:"group_id,omitempty"`
-	Message      string `json:"message,omitempty" yaml:"message,omitempty"`
-	Sender       string `json:"sender,omitempty" yaml:"sender,omitempty"`
-	SenderDevice int32  `json:"sender_device,omitempty" yaml:"sender_device,omitempty"`
-	Timestamp    int64  `json:"timestamp,omitempty" yaml:"timestamp,omitempty"`
-}
-
-func (e ProtocolInvalidKeyIdError) Error() string {
-	return e.Message
-}
-
 type ProtocolInvalidMessageError struct {
 	ContentHint  int32  `json:"content_hint,omitempty" yaml:"content_hint,omitempty"`
 	GroupId      string `json:"group_id,omitempty" yaml:"group_id,omitempty"`
@@ -581,19 +524,6 @@ func (e ProtocolInvalidMessageError) Error() string {
 	return e.Message
 }
 
-type ProtocolNoSessionError struct {
-	ContentHint  int32  `json:"content_hint,omitempty" yaml:"content_hint,omitempty"`
-	GroupId      string `json:"group_id,omitempty" yaml:"group_id,omitempty"`
-	Message      string `json:"message,omitempty" yaml:"message,omitempty"`
-	Sender       string `json:"sender,omitempty" yaml:"sender,omitempty"`
-	SenderDevice int32  `json:"sender_device,omitempty" yaml:"sender_device,omitempty"`
-	Timestamp    int64  `json:"timestamp,omitempty" yaml:"timestamp,omitempty"`
-}
-
-func (e ProtocolNoSessionError) Error() string {
-	return e.Message
-}
-
 type RateLimitError struct {
 	Message string `json:"message,omitempty" yaml:"message,omitempty"`
 }
@@ -602,14 +532,6 @@ func (e RateLimitError) Error() string {
 	return e.Message
 }
 
-type SQLError struct {
-	Message string `json:"message,omitempty" yaml:"message,omitempty"`
-}
-
-func (e SQLError) Error() string {
-	return e.Message
-}
-
 type ScanTimeoutError struct {
 	Message string `json:"message,omitempty" yaml:"message,omitempty"`
 }
@@ -652,15 +574,6 @@ func (e UnregisteredUserError) Error() string {
 	return e.Message
 }
 
-// UnsupportedGroupError: returned in response to use v1 groups, which are no longer supported
-type UnsupportedGroupError struct {
-	Message string `json:"message,omitempty" yaml:"message,omitempty"`
-}
-
-func (e UnsupportedGroupError) Error() string {
-	return e.Message
-}
-
 type UntrustedIdentityError struct {
 	Identifier  string        `json:"identifier,omitempty" yaml:"identifier,omitempty"`
 	IdentityKey **IdentityKey `json:"identity_key,omitempty" yaml:"identity_key,omitempty"`

signald/client-protocol/v1/requests.go

@@ -130,38 +130,6 @@ func (r *ApproveMembershipRequest) Submit(conn *signald.Signald) (response JsonG
 
 }
 
-// Submit: Bans users from a group. This works even if the users aren't in the group. If they are currently in the group, they will also be removed.
-func (r *BanUserRequest) Submit(conn *signald.Signald) (response JsonGroupV2Info, err error) {
-	r.Version = "v1"
-	r.Type = "ban_user"
-	if r.ID == "" {
-		r.ID = signald.GenerateID()
-	}
-	responseChannel := conn.GetResponseListener(r.ID)
-	defer conn.CloseResponseListener(r.ID)
-	err = conn.RawRequest(r)
-	if err != nil {
-		log.Println("signald-go: error submitting request to signald")
-		return
-	}
-
-	rawResponse := <-responseChannel
-	if rawResponse.Error != nil {
-		err = mkerr(rawResponse)
-		return
-	}
-
-	err = json.Unmarshal(rawResponse.Data, &response)
-	if err != nil {
-		rawResponseJson, _ := rawResponse.Data.MarshalJSON()
-		log.Println("signald-go: error unmarshalling response from signald of type", rawResponse.Type, string(rawResponseJson))
-		return
-	}
-
-	return response, nil
-
-}
-
 func (r *CreateGroupRequest) Submit(conn *signald.Signald) (response JsonGroupV2Info, err error) {
 	r.Version = "v1"
 	r.Type = "create_group"
@@ -370,38 +338,6 @@ func (r *GetGroupRequest) Submit(conn *signald.Signald) (response JsonGroupV2Inf
 
 }
 
-// Submit: Query the server for group revision history. The history contains information about the changes between each revision and the user that made the change.
-func (r *GetGroupRevisionPagesRequest) Submit(conn *signald.Signald) (response GroupHistoryPage, err error) {
-	r.Version = "v1"
-	r.Type = "get_group_revision_pages"
-	if r.ID == "" {
-		r.ID = signald.GenerateID()
-	}
-	responseChannel := conn.GetResponseListener(r.ID)
-	defer conn.CloseResponseListener(r.ID)
-	err = conn.RawRequest(r)
-	if err != nil {
-		log.Println("signald-go: error submitting request to signald")
-		return
-	}
-
-	rawResponse := <-responseChannel
-	if rawResponse.Error != nil {
-		err = mkerr(rawResponse)
-		return
-	}
-
-	err = json.Unmarshal(rawResponse.Data, &response)
-	if err != nil {
-		rawResponseJson, _ := rawResponse.Data.MarshalJSON()
-		log.Println("signald-go: error unmarshalling response from signald of type", rawResponse.Type, string(rawResponseJson))
-		return
-	}
-
-	return response, nil
-
-}
-
 // Submit: Get information about a known keys for a particular address
 func (r *GetIdentitiesRequest) Submit(conn *signald.Signald) (response IdentityKeyList, err error) {
 	r.Version = "v1"
@@ -1111,38 +1047,6 @@ func (r *SendPaymentRequest) Submit(conn *signald.Signald) (response SendRespons
 
 }
 
-// Submit: Sends a sync message to the account's devices
-func (r *SendSyncMessageRequest) Submit(conn *signald.Signald) (response JsonSendMessageResult, err error) {
-	r.Version = "v1"
-	r.Type = "send_sync_message"
-	if r.ID == "" {
-		r.ID = signald.GenerateID()
-	}
-	responseChannel := conn.GetResponseListener(r.ID)
-	defer conn.CloseResponseListener(r.ID)
-	err = conn.RawRequest(r)
-	if err != nil {
-		log.Println("signald-go: error submitting request to signald")
-		return
-	}
-
-	rawResponse := <-responseChannel
-	if rawResponse.Error != nil {
-		err = mkerr(rawResponse)
-		return
-	}
-
-	err = json.Unmarshal(rawResponse.Data, &response)
-	if err != nil {
-		rawResponseJson, _ := rawResponse.Data.MarshalJSON()
-		log.Println("signald-go: error unmarshalling response from signald of type", rawResponse.Type, string(rawResponseJson))
-		return
-	}
-
-	return response, nil
-
-}
-
 // Submit: set this device's name. This will show up on the mobile device on the same account under settings -> linked devices
 func (r *SetDeviceNameRequest) Submit(conn *signald.Signald) (err error) {
 	r.Version = "v1"
@@ -1323,38 +1227,6 @@ func (r *TypingRequest) Submit(conn *signald.Signald) (err error) {
 
 }
 
-// Submit: Unbans users from a group.
-func (r *UnbanUserRequest) Submit(conn *signald.Signald) (response JsonGroupV2Info, err error) {
-	r.Version = "v1"
-	r.Type = "unban_user"
-	if r.ID == "" {
-		r.ID = signald.GenerateID()
-	}
-	responseChannel := conn.GetResponseListener(r.ID)
-	defer conn.CloseResponseListener(r.ID)
-	err = conn.RawRequest(r)
-	if err != nil {
-		log.Println("signald-go: error submitting request to signald")
-		return
-	}
-
-	rawResponse := <-responseChannel
-	if rawResponse.Error != nil {
-		err = mkerr(rawResponse)
-		return
-	}
-
-	err = json.Unmarshal(rawResponse.Data, &response)
-	if err != nil {
-		rawResponseJson, _ := rawResponse.Data.MarshalJSON()
-		log.Println("signald-go: error unmarshalling response from signald of type", rawResponse.Type, string(rawResponseJson))
-		return
-	}
-
-	return response, nil
-
-}
-
 // Submit: See subscribe for more info
 func (r *UnsubscribeRequest) Submit(conn *signald.Signald) (err error) {
 	r.Version = "v1"

signald/client-protocol/v1/structs.go

@@ -25,7 +25,6 @@ type Account struct {
 	Address   *JsonAddress `json:"address,omitempty" yaml:"address,omitempty"`       // The address of this account
 	DeviceId  int32        `json:"device_id,omitempty" yaml:"device_id,omitempty"`   // The Signal device ID. Official Signal mobile clients (iPhone and Android) have device ID = 1, while linked devices such as Signal Desktop or Signal iPad have higher device IDs.
 	Pending   bool         `json:"pending,omitempty" yaml:"pending,omitempty"`       // indicates the account has not completed registration
-	Pni       string       `json:"pni,omitempty" yaml:"pni,omitempty"`
 }
 
 type AccountList struct {
@@ -63,19 +62,6 @@ type ApproveMembershipRequest struct {
 	Members []*JsonAddress `json:"members,omitempty" yaml:"members,omitempty"` // list of requesting members to approve
 }
 
-// BanUserRequest: Bans users from a group. This works even if the users aren't in the group. If they are currently in the group, they will also be removed.
-type BanUserRequest struct {
-	Request
-	Account string         `json:"account,omitempty" yaml:"account,omitempty"` // The account to interact with
-	GroupId string         `json:"group_id,omitempty" yaml:"group_id,omitempty"`
-	Users   []*JsonAddress `json:"users,omitempty" yaml:"users,omitempty"` // List of users to ban
-}
-
-type BannedGroupMember struct {
-	Timestamp int64  `json:"timestamp,omitempty" yaml:"timestamp,omitempty"` // Timestamp as milliseconds since Unix epoch of when the user was banned. This field is set by the server.
-	UUID      string `json:"uuid,omitempty" yaml:"uuid,omitempty"`
-}
-
 // BooleanMessage: A message containing a single boolean, usually as a response
 type BooleanMessage struct {
 	Value bool `json:"value,omitempty" yaml:"value,omitempty"`
@@ -99,10 +85,9 @@ type Capabilities struct {
 	AnnouncementGroup bool `json:"announcement_group,omitempty" yaml:"announcement_group,omitempty"`
 	ChangeNumber      bool `json:"change_number,omitempty" yaml:"change_number,omitempty"`
 	Gv1Migration      bool `json:"gv1-migration,omitempty" yaml:"gv1-migration,omitempty"`
-	Gv2               bool `json:"gv2,omitempty" yaml:"gv2,omitempty"` // this capability is deprecated and will always be true
+	Gv2               bool `json:"gv2,omitempty" yaml:"gv2,omitempty"`
 	SenderKey         bool `json:"sender_key,omitempty" yaml:"sender_key,omitempty"`
 	Storage           bool `json:"storage,omitempty" yaml:"storage,omitempty"`
-	Stories           bool `json:"stories,omitempty" yaml:"stories,omitempty"`
 }
 
 // ClientMessageWrapper: Wraps all incoming messages sent to the client after a v1 subscribe request is issued
@@ -142,7 +127,6 @@ type DeviceInfo struct {
 type FinishLinkRequest struct {
 	Request
 	DeviceName string `json:"device_name,omitempty" yaml:"device_name,omitempty"`
-	Overwrite  bool   `json:"overwrite,omitempty" yaml:"overwrite,omitempty"` // overwrite existing account data if the phone number conflicts. false by default
 	SessionId  string `json:"session_id,omitempty" yaml:"session_id,omitempty"`
 }
 
@@ -166,15 +150,6 @@ type GetGroupRequest struct {
 	Revision int32  `json:"revision,omitempty" yaml:"revision,omitempty"` // the latest known revision, default value (-1) forces fetch from server
 }
 
-// GetGroupRevisionPagesRequest: Query the server for group revision history. The history contains information about the changes between each revision and the user that made the change.
-type GetGroupRevisionPagesRequest struct {
-	Request
-	Account              string `json:"account,omitempty" yaml:"account,omitempty"`             // The account to interact with
-	FromRevision         int32  `json:"from_revision,omitempty" yaml:"from_revision,omitempty"` // The revision to start the pages from. Note that if this is lower than the revision you joined the group, an AuthorizationFailedError is returned.
-	GroupId              string `json:"group_id,omitempty" yaml:"group_id,omitempty"`
-	IncludeFirstRevision bool   `json:"include_first_revision,omitempty" yaml:"include_first_revision,omitempty"` // Whether to include the first state in the returned pages (default false)
-}
-
 // GetIdentitiesRequest: Get information about a known keys for a particular address
 type GetIdentitiesRequest struct {
 	Request
@@ -200,11 +175,6 @@ type GetServersRequest struct {
 	Request
 }
 
-type Gradient struct {
-	EndColor   string `json:"end_color,omitempty" yaml:"end_color,omitempty"`
-	StartColor string `json:"start_color,omitempty" yaml:"start_color,omitempty"`
-}
-
 // GroupAccessControl: group access control settings. Options for each controlled action are: UNKNOWN, ANY, MEMBER, ADMINISTRATOR, UNSATISFIABLE and UNRECOGNIZED
 type GroupAccessControl struct {
 	Attributes string `json:"attributes,omitempty" yaml:"attributes,omitempty"` // who can edit group info
@@ -212,42 +182,6 @@ type GroupAccessControl struct {
 	Members    string `json:"members,omitempty" yaml:"members,omitempty"`       // who can add members
 }
 
-// GroupChange: Represents a group change made by a user. This can also represent request link invites. Only the fields relevant to the group change performed will be set. Note that in signald, group changes are currently only received from incoming messages from a message subscription.
-type GroupChange struct {
-	DeleteMembers            []*JsonAddress           `json:"delete_members,omitempty" yaml:"delete_members,omitempty"` // Represents users that have been removed from the group. This can be from admins removing users, or users choosing to leave the group
-	DeletePendingMembers     []*JsonAddress           `json:"delete_pending_members,omitempty" yaml:"delete_pending_members,omitempty"`
-	DeleteRequestingMembers  []*JsonAddress           `json:"delete_requesting_members,omitempty" yaml:"delete_requesting_members,omitempty"`
-	Editor                   *JsonAddress             `json:"editor,omitempty" yaml:"editor,omitempty"`                               // The user that made the change.
-	ModifiedProfileKeys      []*GroupMember           `json:"modified_profile_keys,omitempty" yaml:"modified_profile_keys,omitempty"` // Represents users that have rotated their profile key. Note that signald currently does not expose profile keys to clients. The joined revision property will always be 0 in this list.
-	ModifyMemberRoles        []*GroupMember           `json:"modify_member_roles,omitempty" yaml:"modify_member_roles,omitempty"`     // Represents users with their new, modified role.
-	NewAccessControl         *GroupAccessControl      `json:"new_access_control,omitempty" yaml:"new_access_control,omitempty"`       // If not null, then this group change modified one of the access controls. Some of the properties in here will be null.
-	NewAvatar                bool                     `json:"new_avatar,omitempty" yaml:"new_avatar,omitempty"`                       // Whether this group change changed the avatar.
-	NewBannedMembers         []*BannedGroupMember     `json:"new_banned_members,omitempty" yaml:"new_banned_members,omitempty"`
-	NewDescription           string                   `json:"new_description,omitempty" yaml:"new_description,omitempty"`
-	NewInviteLinkPassword    bool                     `json:"new_invite_link_password,omitempty" yaml:"new_invite_link_password,omitempty"`   // Whether this group change involved resetting the group invite link.
-	NewIsAnnouncementGroup   string                   `json:"new_is_announcement_group,omitempty" yaml:"new_is_announcement_group,omitempty"` // Whether this change affected the announcement group setting. Possible values are UNKNOWN, ENABLED or DISABLED
-	NewMembers               []*GroupMember           `json:"new_members,omitempty" yaml:"new_members,omitempty"`                             // Represents users have been added to the group. This can be from group members adding users, or a users joining via a group link that required no approval.
-	NewPendingMembers        []*GroupPendingMember    `json:"new_pending_members,omitempty" yaml:"new_pending_members,omitempty"`             // Represents a user that has been invited to the group by another user.
-	NewRequestingMembers     []*GroupRequestingMember `json:"new_requesting_members,omitempty" yaml:"new_requesting_members,omitempty"`       // Represents users that have requested to join the group via the group link. Note that members requesting to join might not necessarily have the list of users in the group, so they won't be able to send a peer-to-peer group update message to inform users of their request to join. Other users in the group may inform us that the revision has increased, but the members requesting access will have to be obtained from the server instead (which signald will handle). For now, a get_group request has to be made to get the users that have requested to join the group.
-	NewTimer                 int32                    `json:"new_timer,omitempty" yaml:"new_timer,omitempty"`                                 // New disappearing messages timer value.
-	NewTitle                 string                   `json:"new_title,omitempty" yaml:"new_title,omitempty"`
-	NewUnbannedMembers       []*BannedGroupMember     `json:"new_unbanned_members,omitempty" yaml:"new_unbanned_members,omitempty"`
-	PromotePendingMembers    []*GroupMember           `json:"promote_pending_members,omitempty" yaml:"promote_pending_members,omitempty"`
-	PromoteRequestingMembers []*GroupMember           `json:"promote_requesting_members,omitempty" yaml:"promote_requesting_members,omitempty"`
-	Revision                 int32                    `json:"revision,omitempty" yaml:"revision,omitempty"` // The group revision that this change brings the group to.
-}
-
-type GroupHistoryEntry struct {
-	Change *GroupChange     `json:"change,omitempty" yaml:"change,omitempty"`
-	Group  *JsonGroupV2Info `json:"group,omitempty" yaml:"group,omitempty"`
-}
-
-// GroupHistoryPage: The result of fetching a group's history along with paging data.
-type GroupHistoryPage struct {
-	PagingData *PagingData          `json:"paging_data,omitempty" yaml:"paging_data,omitempty"`
-	Results    []*GroupHistoryEntry `json:"results,omitempty" yaml:"results,omitempty"`
-}
-
 // GroupInfo: A generic type that is used when the group version is not known
 type GroupInfo struct {
 	V1 *JsonGroupInfo   `json:"v1,omitempty" yaml:"v1,omitempty"`
@@ -263,7 +197,7 @@ type GroupLinkInfoRequest struct {
 
 type GroupList struct {
 	Groups       []*JsonGroupV2Info `json:"groups,omitempty" yaml:"groups,omitempty"`
-	LegacyGroups []*JsonGroupInfo   `json:"legacyGroups,omitempty" yaml:"legacyGroups,omitempty"` // list of legacy (v1) groups, no longer supported (will always be empty)
+	LegacyGroups []*JsonGroupInfo   `json:"legacyGroups,omitempty" yaml:"legacyGroups,omitempty"`
 }
 
 type GroupMember struct {
@@ -272,18 +206,6 @@ type GroupMember struct {
 	UUID           string `json:"uuid,omitempty" yaml:"uuid,omitempty"`
 }
 
-type GroupPendingMember struct {
-	AddedByUuid string `json:"added_by_uuid,omitempty" yaml:"added_by_uuid,omitempty"`
-	Role        string `json:"role,omitempty" yaml:"role,omitempty"` // possible values are: UNKNOWN, DEFAULT, ADMINISTRATOR and UNRECOGNIZED
-	Timestamp   int64  `json:"timestamp,omitempty" yaml:"timestamp,omitempty"`
-	UUID        string `json:"uuid,omitempty" yaml:"uuid,omitempty"`
-}
-
-type GroupRequestingMember struct {
-	Timestamp int64  `json:"timestamp,omitempty" yaml:"timestamp,omitempty"`
-	UUID      string `json:"uuid,omitempty" yaml:"uuid,omitempty"`
-}
-
 type HangupMessage struct {
 	DeviceId int32  `json:"device_id,omitempty" yaml:"device_id,omitempty"`
 	ID       int64  `json:"id,omitempty" yaml:"id,omitempty"`
@@ -322,7 +244,6 @@ type IncomingMessage struct {
 	ServerReceiverTimestamp int64            `json:"server_receiver_timestamp,omitempty" yaml:"server_receiver_timestamp,omitempty"`
 	Source                  *JsonAddress     `json:"source,omitempty" yaml:"source,omitempty"`
 	SourceDevice            int32            `json:"source_device,omitempty" yaml:"source_device,omitempty"`
-	StoryMessage            *StoryMessage    `json:"story_message,omitempty" yaml:"story_message,omitempty"`
 	SyncMessage             *JsonSyncMessage `json:"sync_message,omitempty" yaml:"sync_message,omitempty"`
 	Timestamp               int64            `json:"timestamp,omitempty" yaml:"timestamp,omitempty"`
 	Type                    string           `json:"type,omitempty" yaml:"type,omitempty"`
@@ -381,7 +302,6 @@ type JsonDataMessage struct {
 	Group            *JsonGroupInfo    `json:"group,omitempty" yaml:"group,omitempty"`                         // if the incoming message was sent to a v1 group, information about that group will be here
 	GroupV2          *JsonGroupV2Info  `json:"groupV2,omitempty" yaml:"groupV2,omitempty"`                     // if the incoming message was sent to a v2 group, basic identifying information about that group will be here. If group information changes, JsonGroupV2Info.revision is incremented. If the group revision is higher than previously seen, a client can retrieve the group information by calling get_group.
 	GroupCallUpdate  string            `json:"group_call_update,omitempty" yaml:"group_call_update,omitempty"` // the eraId string from a group call message update
-	IsExpirationUpdate bool              `json:"is_expiration_update,omitempty" yaml:"is_expiration_update,omitempty"` // whether or not this message changes the expiresInSeconds value for the whole chat. Some messages (remote deletes, reactions, etc) will have expiresInSeconds=0 even though the chat has disappearing messages enabled.
 	Mentions         []*JsonMention    `json:"mentions,omitempty" yaml:"mentions,omitempty"`                   // list of mentions in the message
 	Payment          *Payment          `json:"payment,omitempty" yaml:"payment,omitempty"`                     // details about the MobileCoin payment attached to the message, if present
 	Previews         []*JsonPreview    `json:"previews,omitempty" yaml:"previews,omitempty"`                   // if the incoming message has a link preview, information about that preview will be here
@@ -390,7 +310,6 @@ type JsonDataMessage struct {
 	Reaction         *JsonReaction     `json:"reaction,omitempty" yaml:"reaction,omitempty"`         // if the message adds or removes a reaction to another message, this will indicate what change is being made
 	RemoteDelete     *RemoteDelete     `json:"remoteDelete,omitempty" yaml:"remoteDelete,omitempty"` // if the inbound message is deleting a previously sent message, indicates which message should be deleted
 	Sticker          *v0.JsonSticker   `json:"sticker,omitempty" yaml:"sticker,omitempty"`           // if the incoming message is a sticker, information about the sicker will be here
-	StoryContext       *StoryContext     `json:"story_context,omitempty" yaml:"story_context,omitempty"`
 	Timestamp        int64             `json:"timestamp,omitempty" yaml:"timestamp,omitempty"`       // the timestamp that the message was sent at, according to the sender's device. This is used to uniquely identify this message for things like reactions and quotes.
 	ViewOnce         bool              `json:"viewOnce,omitempty" yaml:"viewOnce,omitempty"`         // indicates the message is a view once message. View once messages typically include no body and a single image attachment. Official Signal clients will prevent the user from saving the image, and once the user has viewed the image once they will destroy the image.
 }
@@ -419,9 +338,7 @@ type JsonGroupV2Info struct {
 	AccessControl       *GroupAccessControl `json:"accessControl,omitempty" yaml:"accessControl,omitempty"` // current access control settings for this group
 	Announcements       string              `json:"announcements,omitempty" yaml:"announcements,omitempty"` // indicates if the group is an announcements group. Only admins are allowed to send messages to announcements groups. Options are UNKNOWN, ENABLED or DISABLED
 	Avatar              string              `json:"avatar,omitempty" yaml:"avatar,omitempty"`               // path to the group's avatar on local disk, if available
-	BannedMembers       []*BannedGroupMember `json:"banned_members,omitempty" yaml:"banned_members,omitempty"`
 	Description         string              `json:"description,omitempty" yaml:"description,omitempty"`
-	GroupChange         *GroupChange         `json:"group_change,omitempty" yaml:"group_change,omitempty"` // Represents a peer-to-peer group change done by a user. Will not be set if the group change signature fails verification. This is usually only set inside of incoming messages.
 	ID                  string              `json:"id,omitempty" yaml:"id,omitempty"`
 	InviteLink          string              `json:"inviteLink,omitempty" yaml:"inviteLink,omitempty"`     // the signal.group link, if applicable
 	MemberDetail        []*GroupMember      `json:"memberDetail,omitempty" yaml:"memberDetail,omitempty"` // detailed member list
@@ -441,11 +358,31 @@ type JsonMention struct {
 	UUID   string `json:"uuid,omitempty" yaml:"uuid,omitempty"`     // The UUID of the account being mentioned
 }
 
-// JsonMessageRequestResponseMessage: Responses to message requests from unknown users or groups
+type JsonMessageEnvelope struct {
+	CallMessage              *v0.JsonCallMessage    `json:"callMessage,omitempty" yaml:"callMessage,omitempty"`
+	DataMessage              *JsonDataMessage       `json:"dataMessage,omitempty" yaml:"dataMessage,omitempty"`
+	HasContent               bool                   `json:"hasContent,omitempty" yaml:"hasContent,omitempty"`
+	HasLegacyMessage         bool                   `json:"hasLegacyMessage,omitempty" yaml:"hasLegacyMessage,omitempty"`
+	IsUnidentifiedSender     bool                   `json:"isUnidentifiedSender,omitempty" yaml:"isUnidentifiedSender,omitempty"`
+	Receipt                  *v0.JsonReceiptMessage `json:"receipt,omitempty" yaml:"receipt,omitempty"`
+	Relay                    string                 `json:"relay,omitempty" yaml:"relay,omitempty"`
+	ServerDeliveredTimestamp int64                  `json:"serverDeliveredTimestamp,omitempty" yaml:"serverDeliveredTimestamp,omitempty"`
+	ServerTimestamp          int64                  `json:"serverTimestamp,omitempty" yaml:"serverTimestamp,omitempty"`
+	Source                   *JsonAddress           `json:"source,omitempty" yaml:"source,omitempty"`
+	SourceDevice             int32                  `json:"sourceDevice,omitempty" yaml:"sourceDevice,omitempty"`
+	SyncMessage              *JsonSyncMessage       `json:"syncMessage,omitempty" yaml:"syncMessage,omitempty"`
+	Timestamp                int64                  `json:"timestamp,omitempty" yaml:"timestamp,omitempty"`
+	TimestampISO             string                 `json:"timestampISO,omitempty" yaml:"timestampISO,omitempty"`
+	Type                     string                 `json:"type,omitempty" yaml:"type,omitempty"`
+	Typing                   *v0.JsonTypingMessage  `json:"typing,omitempty" yaml:"typing,omitempty"`
+	Username                 string                 `json:"username,omitempty" yaml:"username,omitempty"`
+	UUID                     string                 `json:"uuid,omitempty" yaml:"uuid,omitempty"`
+}
+
 type JsonMessageRequestResponseMessage struct {
 	GroupId string       `json:"groupId,omitempty" yaml:"groupId,omitempty"`
 	Person  *JsonAddress `json:"person,omitempty" yaml:"person,omitempty"`
-	Type    string       `json:"type,omitempty" yaml:"type,omitempty"` // One of UNKNOWN, ACCEPT, DELETE, BLOCK, BLOCK_AND_DELETE, UNBLOCK_AND_ACCEPT
+	Type    string       `json:"type,omitempty" yaml:"type,omitempty"`
 }
 
 // JsonPreview: metadata about one of the links in a message
@@ -492,7 +429,6 @@ type JsonSentTranscriptMessage struct {
 	ExpirationStartTimestamp int64             `json:"expirationStartTimestamp,omitempty" yaml:"expirationStartTimestamp,omitempty"`
 	IsRecipientUpdate        bool              `json:"isRecipientUpdate,omitempty" yaml:"isRecipientUpdate,omitempty"`
 	Message                  *JsonDataMessage  `json:"message,omitempty" yaml:"message,omitempty"`
-	Story                    *StoryMessage     `json:"story,omitempty" yaml:"story,omitempty"`
 	Timestamp                int64             `json:"timestamp,omitempty" yaml:"timestamp,omitempty"`
 	UnidentifiedStatus       map[string]string `json:"unidentifiedStatus,omitempty" yaml:"unidentifiedStatus,omitempty"`
 }
@@ -583,11 +519,6 @@ type OfferMessage struct {
 	Type   string `json:"type,omitempty" yaml:"type,omitempty"`
 }
 
-type PagingData struct {
-	HasMorePages     bool  `json:"has_more_pages,omitempty" yaml:"has_more_pages,omitempty"`
-	NextPageRevision int32 `json:"next_page_revision,omitempty" yaml:"next_page_revision,omitempty"`
-}
-
 // Payment: details about a MobileCoin payment
 type Payment struct {
 	Note    string `json:"note,omitempty" yaml:"note,omitempty"`       // note attached to the payment
@@ -601,7 +532,6 @@ type Profile struct {
 	Avatar            string        `json:"avatar,omitempty" yaml:"avatar,omitempty"` // path to avatar on local disk
 	Capabilities      *Capabilities `json:"capabilities,omitempty" yaml:"capabilities,omitempty"`
 	Color             string        `json:"color,omitempty" yaml:"color,omitempty"` // color of the chat with this user
-	ContactName       string        `json:"contact_name,omitempty" yaml:"contact_name,omitempty"` // The user's name from local contact names
 	Emoji             string        `json:"emoji,omitempty" yaml:"emoji,omitempty"`
 	ExpirationTime    int32         `json:"expiration_time,omitempty" yaml:"expiration_time,omitempty"`
 	InboxPosition     int32         `json:"inbox_position,omitempty" yaml:"inbox_position,omitempty"`
@@ -636,7 +566,6 @@ type ReceiptMessage struct {
 type RefuseMembershipRequest struct {
 	Request
 	Account string         `json:"account,omitempty" yaml:"account,omitempty"` // The account to interact with
-	AlsoBan bool           `json:"also_ban,omitempty" yaml:"also_ban,omitempty"`
 	GroupId string         `json:"group_id,omitempty" yaml:"group_id,omitempty"`
 	Members []*JsonAddress `json:"members,omitempty" yaml:"members,omitempty"` // list of requesting members to refuse
 }
@@ -729,7 +658,6 @@ type SendPaymentRequest struct {
 
 type SendRequest struct {
 	Request
-	Account          string            `json:"account,omitempty" yaml:"account,omitempty"`
 	Attachments      []*JsonAttachment `json:"attachments,omitempty" yaml:"attachments,omitempty"`
 	Members          []*JsonAddress    `json:"members,omitempty" yaml:"members,omitempty"` // Optionally set to a sub-set of group members. Ignored if recipientGroupId isn't specified
 	Mentions         []*JsonMention    `json:"mentions,omitempty" yaml:"mentions,omitempty"`
@@ -754,14 +682,6 @@ type SendSuccess struct {
 	Unidentified bool    `json:"unidentified,omitempty" yaml:"unidentified,omitempty"`
 }
 
-// SendSyncMessageRequest: Sends a sync message to the account's devices
-type SendSyncMessageRequest struct {
-	Request
-	Account                string                             `json:"account,omitempty" yaml:"account,omitempty"`
-	MessageRequestResponse *JsonMessageRequestResponseMessage `json:"message_request_response,omitempty" yaml:"message_request_response,omitempty"` // This can be set to indicate to other devices about a response to an incoming message request from an unknown user or group. Warning: Using the BLOCK and BLOCK_AND_DELETE options relies on other devices to do the blocking, and it does not make you leave the group!
-	ViewOnceOpenMessage    *JsonViewOnceOpenMessage           `json:"view_once_open_message,omitempty" yaml:"view_once_open_message,omitempty"`     // This can be set to indicate to other devices about having viewed a view-once message.
-}
-
 // Server: a Signal server
 type Server struct {
 	Ca                     string       `json:"ca,omitempty" yaml:"ca,omitempty"` // base64 encoded trust store, password must be 'whisper'
@@ -864,23 +784,6 @@ type SharedContactPhone struct {
 	Value string `json:"value,omitempty" yaml:"value,omitempty"` // the phone number
 }
 
-// StorageChange: Broadcast to subscribed clients when there is a state change from the storage service
-type StorageChange struct {
-	Version int64 `json:"version,omitempty" yaml:"version,omitempty"` // Seems to behave like the group version numbers and increments every time the state changes
-}
-
-type StoryContext struct {
-	Author        string `json:"author,omitempty" yaml:"author,omitempty"`
-	SentTimestamp int64  `json:"sent_timestamp,omitempty" yaml:"sent_timestamp,omitempty"`
-}
-
-type StoryMessage struct {
-	AllowReplies bool             `json:"allow_replies,omitempty" yaml:"allow_replies,omitempty"`
-	File         *JsonAttachment  `json:"file,omitempty" yaml:"file,omitempty"`
-	Group        *JsonGroupV2Info `json:"group,omitempty" yaml:"group,omitempty"`
-	Text         *TextAttachment  `json:"text,omitempty" yaml:"text,omitempty"`
-}
-
 type SubmitChallengeRequest struct {
 	Request
 	Account      string `json:"account,omitempty" yaml:"account,omitempty"`
@@ -894,16 +797,6 @@ type SubscribeRequest struct {
 	Account string `json:"account,omitempty" yaml:"account,omitempty"` // The account to subscribe to incoming message for
 }
 
-type TextAttachment struct {
-	BackgroundColor     string       `json:"background_color,omitempty" yaml:"background_color,omitempty"`
-	BackgroundGradient  *Gradient    `json:"background_gradient,omitempty" yaml:"background_gradient,omitempty"`
-	Preview             *JsonPreview `json:"preview,omitempty" yaml:"preview,omitempty"`
-	Style               string       `json:"style,omitempty" yaml:"style,omitempty"`
-	Text                string       `json:"text,omitempty" yaml:"text,omitempty"`
-	TextBackgroundColor string       `json:"text_background_color,omitempty" yaml:"text_background_color,omitempty"`
-	TextForegroundColor string       `json:"text_foreground_color,omitempty" yaml:"text_foreground_color,omitempty"`
-}
-
 // TrustRequest: Trust another user's safety number using either the QR code data or the safety number text
 type TrustRequest struct {
 	Request
@@ -930,14 +823,6 @@ type TypingRequest struct {
 	When    int64        `json:"when,omitempty" yaml:"when,omitempty"`
 }
 
-// UnbanUserRequest: Unbans users from a group.
-type UnbanUserRequest struct {
-	Request
-	Account string         `json:"account,omitempty" yaml:"account,omitempty"` // The account to interact with
-	GroupId string         `json:"group_id,omitempty" yaml:"group_id,omitempty"`
-	Users   []*JsonAddress `json:"users,omitempty" yaml:"users,omitempty"` // List of users to unban
-}
-
 // UnsubscribeRequest: See subscribe for more info
 type UnsubscribeRequest struct {
 	Request

signald/signald.go

@@ -99,12 +99,13 @@ func (s *Signald) connect() error {
 	return nil
 }
 
+
 func (s *Signald) Close() error {
 	return s.socket.Close()
 }
 
 // Listen listens for events from signald
-func (s *Signald) Listen(c chan client_protocol.BasicResponse) error {
+func (s *Signald) Listen(c chan client_protocol.BasicResponse) {
 	for {
 		msg, err := s.readNext()
 		if err == io.EOF {
@@ -112,11 +113,7 @@ func (s *Signald) Listen(c chan client_protocol.BasicResponse) error {
 			if c != nil {
 				close(c)
 			}
-			return nil
+			return
-		}
-
-		if err != nil {
-			return err
 		}
 
 		if msg.Type == "unexpected_error" {
@@ -178,6 +175,9 @@ func (s *Signald) readNext() (b client_protocol.BasicResponse, err error) {
 	} else {
 		err = json.NewDecoder(s.socket).Decode(&b)
 	}
-
+	if err != nil {
+		log.Println("signald-go: error decoding message from signald:", err)
+		return
+	}
 	return
 }