aljaz/signal-cli-rest-api
1
0
Fork 0
mirror of https://github.com/aljazceru/signal-cli-rest-api.git synced 2025-12-19 15:44:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

reworked code to make it more maintainable

Browse Source 
* added recipient type. This change is necessary to implement sending
  messages to usernames/username links.
This commit is contained in:
Bernhard B
2024-05-11 17:48:24 +02:00
parent 4b029b9e98
commit 70763ae9d9
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/client/client.go
View File

@@ -190,12 +190,20 @@ type ListInstalledStickerPacksResponse struct {
Author string `json:"author"` Author string `json:"author"`
} }
type RecpType int
const (
Number RecpType = iota + 1
Username
Group
)
type SignalCliSendRequest struct { type SignalCliSendRequest struct {
Number string Number string
Message string Message string
Recipients []string Recipients []string
Base64Attachments []string Base64Attachments []string
IsGroup bool RecipientType RecpType
Sticker string Sticker string
Mentions []MessageMention Mentions []MessageMention
QuoteTimestamp *int64 QuoteTimestamp *int64
@@ -378,7 +386,7 @@ func (s *SignalClient) send(signalCliSendRequest SignalCliSendRequest) (*SendRes
} }
var groupId string = "" var groupId string = ""
if signalCliSendRequest.IsGroup { if signalCliSendRequest.RecipientType == Group {
if len(signalCliSendRequest.Recipients) > 1 { if len(signalCliSendRequest.Recipients) > 1 {
return nil, errors.New("More than one recipient is currently not allowed") return nil, errors.New("More than one recipient is currently not allowed")
} }
@@ -426,10 +434,12 @@ func (s *SignalClient) send(signalCliSendRequest SignalCliSendRequest) (*SendRes
} }
request := Request{Message: signalCliSendRequest.Message} request := Request{Message: signalCliSendRequest.Message}
if signalCliSendRequest.IsGroup { if signalCliSendRequest.RecipientType == Group {
request.GroupId = groupId request.GroupId = groupId
} else { } else if signalCliSendRequest.RecipientType == Number {
request.Recipients = signalCliSendRequest.Recipients request.Recipients = signalCliSendRequest.Recipients
} else if signalCliSendRequest.RecipientType == Username {
//TODO: fix for username
} }
for _, attachmentEntry := range attachmentEntries { for _, attachmentEntry := range attachmentEntries {
request.Attachments = append(request.Attachments, attachmentEntry.toDataForSignal()) request.Attachments = append(request.Attachments, attachmentEntry.toDataForSignal())
@@ -480,10 +490,12 @@ func (s *SignalClient) send(signalCliSendRequest SignalCliSendRequest) (*SendRes
} }
} else { } else {
cmd := []string{"--config", s.signalCliConfig, "-a", signalCliSendRequest.Number, "send", "--message-from-stdin"} cmd := []string{"--config", s.signalCliConfig, "-a", signalCliSendRequest.Number, "send", "--message-from-stdin"}
if !signalCliSendRequest.IsGroup { if signalCliSendRequest.RecipientType == Number {
cmd = append(cmd, signalCliSendRequest.Recipients...) cmd = append(cmd, signalCliSendRequest.Recipients...)
} else { } else if signalCliSendRequest.RecipientType == Group {
cmd = append(cmd, []string{"-g", groupId}...) cmd = append(cmd, []string{"-g", groupId}...)
} else if signalCliSendRequest.RecipientType == Username {
//TODO fix for usernames
} }
if len(signalCliTextFormatStrings) > 0 { if len(signalCliTextFormatStrings) > 0 {
@@ -662,8 +674,13 @@ func (s *SignalClient) VerifyRegisteredNumber(number string, token string, pin s
} }
func (s *SignalClient) SendV1(number string, message string, recipients []string, base64Attachments []string, isGroup bool) (*SendResponse, error) { func (s *SignalClient) SendV1(number string, message string, recipients []string, base64Attachments []string, isGroup bool) (*SendResponse, error) {
recipientType := Number
if isGroup {
recipientType = Group
}
signalCliSendRequest := SignalCliSendRequest{Number: number, Message: message, Recipients: recipients, Base64Attachments: base64Attachments, signalCliSendRequest := SignalCliSendRequest{Number: number, Message: message, Recipients: recipients, Base64Attachments: base64Attachments,
IsGroup: isGroup, Sticker: "", Mentions: nil, QuoteTimestamp: nil, QuoteAuthor: nil, QuoteMessage: nil, RecipientType: recipientType, Sticker: "", Mentions: nil, QuoteTimestamp: nil, QuoteAuthor: nil, QuoteMessage: nil,
QuoteMentions: nil, TextMode: nil, EditTimestamp: nil} QuoteMentions: nil, TextMode: nil, EditTimestamp: nil}
timestamp, err := s.send(signalCliSendRequest) timestamp, err := s.send(signalCliSendRequest)
return timestamp, err return timestamp, err
@@ -716,7 +733,7 @@ func (s *SignalClient) SendV2(number string, message string, recps []string, bas
timestamps := []SendResponse{} timestamps := []SendResponse{}
for _, group := range groups { for _, group := range groups {
signalCliSendRequest := SignalCliSendRequest{Number: number, Message: message, Recipients: []string{group}, Base64Attachments: base64Attachments, signalCliSendRequest := SignalCliSendRequest{Number: number, Message: message, Recipients: []string{group}, Base64Attachments: base64Attachments,
IsGroup: true, Sticker: sticker, Mentions: mentions, QuoteTimestamp: quoteTimestamp, RecipientType: Group, Sticker: sticker, Mentions: mentions, QuoteTimestamp: quoteTimestamp,
QuoteAuthor: quoteAuthor, QuoteMessage: quoteMessage, QuoteMentions: quoteMentions, QuoteAuthor: quoteAuthor, QuoteMessage: quoteMessage, QuoteMentions: quoteMentions,
TextMode: textMode, EditTimestamp: editTimestamp} TextMode: textMode, EditTimestamp: editTimestamp}
timestamp, err := s.send(signalCliSendRequest) timestamp, err := s.send(signalCliSendRequest)
@@ -728,7 +745,7 @@ func (s *SignalClient) SendV2(number string, message string, recps []string, bas
if len(recipients) > 0 { if len(recipients) > 0 {
signalCliSendRequest := SignalCliSendRequest{Number: number, Message: message, Recipients: recipients, Base64Attachments: base64Attachments, signalCliSendRequest := SignalCliSendRequest{Number: number, Message: message, Recipients: recipients, Base64Attachments: base64Attachments,
IsGroup: false, Sticker: sticker, Mentions: mentions, QuoteTimestamp: quoteTimestamp, RecipientType: Number, Sticker: sticker, Mentions: mentions, QuoteTimestamp: quoteTimestamp,
QuoteAuthor: quoteAuthor, QuoteMessage: quoteMessage, QuoteMentions: quoteMentions, QuoteAuthor: quoteAuthor, QuoteMessage: quoteMessage, QuoteMentions: quoteMentions,
TextMode: textMode, EditTimestamp: editTimestamp} TextMode: textMode, EditTimestamp: editTimestamp}
timestamp, err := s.send(signalCliSendRequest) timestamp, err := s.send(signalCliSendRequest)