diff --git a/src/api/api.go b/src/api/api.go index addc9e3..c4d2042 100644 --- a/src/api/api.go +++ b/src/api/api.go @@ -1334,6 +1334,33 @@ func (a *Api) JoinGroup(c *gin.Context) { c.Status(http.StatusNoContent) } +// @Summary Join a Signal Group by invite link. +// @Tags Groups +// @Description Join the specified Signal Group by invite link. +// @Accept json +// @Produce json +// @Success 204 {string} OK +// @Failure 400 {object} Error +// @Param number path string true "Registered Phone Number" +// @Query invite_link query string true "Invite Link" +// @Router /v1/groups/{number}/join_by_invite_link [post] +func (a *Api) JoinGroupByInviteLink(c *gin.Context) { + number := c.Param("number") + if number == "" { + c.JSON(400, Error{Msg: "Couldn't process request - number missing"}) + return + } + + inviteLink := c.Query("invite_link") + err := a.signalClient.JoinGroupByInviteLink(number, inviteLink) + if err != nil { + c.JSON(400, Error{Msg: err.Error()}) + return + } + + c.Status(http.StatusNoContent) +} + // @Summary Quit a Signal Group. // @Tags Groups // @Description Quit the specified Signal Group. diff --git a/src/client/client.go b/src/client/client.go index ef6bc66..48397d3 100644 --- a/src/client/client.go +++ b/src/client/client.go @@ -5,13 +5,14 @@ import ( "encoding/json" "errors" "fmt" - log "github.com/sirupsen/logrus" "io/ioutil" "os" "path/filepath" "strconv" "strings" + log "github.com/sirupsen/logrus" + securejoin "github.com/cyphar/filepath-securejoin" "github.com/h2non/filetype" @@ -1549,6 +1550,24 @@ func (s *SignalClient) JoinGroup(number string, groupId string) error { return err } +func (s *SignalClient) JoinGroupByInviteLink(number string, inviteLink string) error { + var err error + if s.signalCliMode == JsonRpc { + type Request struct { + InviteLink string `json:"uri"` + } + request := Request{InviteLink: inviteLink} + jsonRpc2Client, err := s.getJsonRpc2Client() + if err != nil { + return err + } + _, err = jsonRpc2Client.getRaw("joinGroup", &number, request) + } else { + _, err = s.cliClient.Execute(true, []string{"--config", s.signalCliConfig, "-a", number, "joinGroup", "--uri", inviteLink}, "") + } + return err +} + func (s *SignalClient) QuitGroup(number string, groupId string) error { var err error if s.signalCliMode == JsonRpc { diff --git a/src/main.go b/src/main.go index 8e51733..1abd6be 100644 --- a/src/main.go +++ b/src/main.go @@ -3,6 +3,11 @@ package main import ( "encoding/json" "flag" + "io/ioutil" + "net/http" + "os" + "strconv" + "github.com/bbernhard/signal-cli-rest-api/api" "github.com/bbernhard/signal-cli-rest-api/client" docs "github.com/bbernhard/signal-cli-rest-api/docs" @@ -12,10 +17,6 @@ import ( log "github.com/sirupsen/logrus" swaggerFiles "github.com/swaggo/files" ginSwagger "github.com/swaggo/gin-swagger" - "io/ioutil" - "net/http" - "os" - "strconv" ) // @title Signal Cli REST API @@ -191,6 +192,7 @@ func main() { { groups.POST(":number", api.CreateGroup) groups.GET(":number", api.GetGroups) + groups.POST(":number/join_by_invite_link", api.JoinGroupByInviteLink) groups.GET(":number/:groupid", api.GetGroup) groups.DELETE(":number/:groupid", api.DeleteGroup) groups.POST(":number/:groupid/block", api.BlockGroup)