Merge afb62b149f3e9f7472c127db41343a546ebe5ea8 into 8d13f5f3836d5fd5fcdeda57f3a17c2e81f2426b

Dockerfile

@@ -1,13 +1,13 @@
 ARG SIGNAL_CLI_VERSION=0.14.0
 ARG LIBSIGNAL_CLIENT_VERSION=0.87.4
-ARG SIGNAL_CLI_NATIVE_PACKAGE_VERSION=0.13.24+morph027+2
+ARG SIGNAL_CLI_NATIVE_PACKAGE_VERSION=0.14.0+morph027+2
 
 ARG SWAG_VERSION=1.16.4
 ARG GRAALVM_VERSION=25.0.2
 
 ARG BUILD_VERSION_ARG=unset
 
-FROM golang:1.24 AS buildcontainer
+FROM golang:1.24-bookworm AS buildcontainer
 
 ARG SIGNAL_CLI_VERSION
 ARG LIBSIGNAL_CLIENT_VERSION
@@ -31,7 +31,7 @@ RUN arch="$(uname -m)"; \
 RUN dpkg-reconfigure debconf --frontend=noninteractive \
 	&& apt-get update \
 	&& apt-get -y install --no-install-recommends \
-		wget git locales zip unzip \
+		wget software-properties-common git locales zip unzip \
 		file build-essential libz-dev zlib1g-dev \
 	&& rm -rf /var/lib/apt/lists/* 
 

docker-compose.yml

@@ -1,22 +1,11 @@
+version: "3"
 services:
   signal-cli-rest-api:
-    #image: bbernhard/signal-cli-rest-api:latest-dev
-    build: "."
+    image: bbernhard/signal-cli-rest-api:latest
     environment:
-      - MODE=normal #supported modes: json-rpc, json-rpc-native, native, normal
-      - ENABLE_PLUGINS=true
-      - DEFAULT_SIGNAL_TEXT_MODE=styled
-      - SWAGGER_IP=127.0.0.1
-      - PODMAN_USERNS=keep-id
-      #- JSON_RPC_IGNORE_ATTACHMENTS=true
-      #- JSON_RPC_IGNORE_STORIES=true
-      #- RECEIVE_WEBHOOK_URL=http://127.0.0.1:8089/webhook
-      #- JSON_RPC_TRUST_NEW_IDENTITIES=always
-      #- RECEIVE_WEBHOOK_URL=http://127.0.0.1:8080/v1/plugins/abc
+      - MODE=normal #supported modes: json-rpc, native, normal
       #- AUTO_RECEIVE_SCHEDULE=0 22 * * * #enable this parameter on demand (see description below)
-    #network_mode: host
     ports:
       - "8080:8080" #map docker port 8080 to host port 8080.
     volumes:
       - "./signal-cli-config:/home/.local/share/signal-cli" #map "signal-cli-config" folder on host system into docker container. the folder contains the password and cryptographic keys when a new number is registered
-      - "./plugins:/plugins"

src/api/api.go

@@ -843,7 +843,6 @@ func (a *Api) AddMembersToGroup(c *gin.Context) {
 
 	err = a.signalClient.AddMembersToGroup(number, groupId, req.Members)
 	if err != nil {
-		log.Info("ERR NOT NULL")
 		switch err.(type) {
 		case *client.NotFoundError:
 			c.JSON(404, Error{Msg: err.Error()})

src/client/client.go

@@ -1349,7 +1349,7 @@ func (s *SignalClient) GetGroups(number string) ([]GroupEntry, error) {
 			}
 			pendingMembers = append(pendingMembers, identifier)
 		}
-		groupEntry.PendingInvites = pendingMembers
+		groupEntry.PendingRequests = pendingMembers
 
 		requestingMembers := []string{}
 		for _, val := range signalCliGroupEntry.RequestingMembers {
@@ -1359,7 +1359,7 @@ func (s *SignalClient) GetGroups(number string) ([]GroupEntry, error) {
 			}
 			requestingMembers = append(requestingMembers, identifier)
 		}
-		groupEntry.PendingRequests = requestingMembers
+		groupEntry.PendingInvites = requestingMembers
 
 		admins := []string{}
 		for _, val := range signalCliGroupEntry.Admins {
@@ -2705,6 +2705,7 @@ func (s *SignalClient) ListContacts(number string, allRecipients bool, recipient
 	return resp, nil
 }
 
+
 func (s *SignalClient) SetPin(number string, registrationLockPin string) error {
 	if s.signalCliMode == JsonRpc {
 		type Request struct {