-
Notifications
You must be signed in to change notification settings - Fork 0
Whatsmeow #15
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Whatsmeow #15
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
9d25ac3
start implementing whatsmeow
ashiven 8c82317
start fixing errors
ashiven 017d002
continue implementing whatsmeow
ashiven 036112b
fix whatsmeow
ashiven df74797
adjust backend dockerfile for whatsmeow
ashiven cd580c6
fix phonenumber case
ashiven File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| twilio-join-sandbox.txt | ||
| config.ini.local | ||
| .env.local | ||
| devicestore.db |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,18 @@ | ||
| FROM golang:1.24.6 AS builder | ||
| FROM golang:1.24-alpine AS builder | ||
| ENV CGO_ENABLED=1 | ||
| RUN apk add --no-cache gcc musl-dev sqlite-dev | ||
| WORKDIR /app | ||
|
|
||
| COPY go.mod go.sum ./ | ||
| RUN go mod download | ||
| COPY . . | ||
| RUN CGO_ENABLED=0 go build -o backend main.go | ||
| RUN go build -o backend main.go | ||
|
|
||
| FROM gcr.io/distroless/static-debian12 | ||
| FROM alpine:3.21 | ||
| RUN apk add --no-cache sqlite-libs | ||
| WORKDIR /app | ||
| COPY --from=builder /app/backend . | ||
| COPY .env . | ||
| COPY config.ini . | ||
|
|
||
| EXPOSE 8080 | ||
| CMD ["./backend"] | ||
| CMD ["./backend", "-w"] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,23 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "household-planner/pkg/backend" | ||
| "household-planner/pkg/planner" | ||
| "os" | ||
| "slices" | ||
| "time" | ||
|
|
||
| "github.com/kr/pretty" | ||
| "go.mau.fi/whatsmeow/proto/waE2E" | ||
| "google.golang.org/protobuf/proto" | ||
| ) | ||
|
|
||
| func main() { | ||
| fmt.Println("[INFO] Starting Household Planner...") | ||
| debug := len(os.Args) > 1 && os.Args[1] == "-d" | ||
| debug := len(os.Args) > 1 && slices.Contains(os.Args, "-d") | ||
| useWhatsApp := len(os.Args) > 1 && slices.Contains(os.Args, "-w") | ||
|
|
||
| myHousehold, err := planner.NewHousehold() | ||
| if err != nil { | ||
|
|
@@ -24,7 +31,6 @@ func main() { | |
| for { | ||
| if debug { | ||
| fmt.Println("[DEBUG] Starting next day in one minute...: ") | ||
| // fmt.Printf("%# v\n", pretty.Formatter(myHousehold)) | ||
| time.Sleep(1 * time.Minute) | ||
| } else { | ||
| planner.WaitUntilNoon() | ||
|
|
@@ -38,10 +44,44 @@ func main() { | |
| myHousehold.AssignWeeklyTasks() | ||
| myHousehold.AssignMonthlyTasks() | ||
|
|
||
| client := planner.InitializeTwilioClient() | ||
| for _, member := range myHousehold.Members { | ||
| assignedTasks := myHousehold.GetAssignedTasks(member) | ||
| planner.SendMessageSms(client, member, assignedTasks, debug) | ||
| // Send messages via whatsmeow | ||
| if useWhatsApp { | ||
| client := planner.NewWhatsmeowClient() | ||
|
|
||
| // NOTE: Needs QR Login via terminal on first startup | ||
| planner.Login(client) | ||
| time.Sleep(time.Second * 30) | ||
|
ashiven marked this conversation as resolved.
|
||
|
|
||
| phoneNumbers := myHousehold.PhoneNumbers() | ||
| JIDs := planner.PhoneNumbersToJIDs(client, phoneNumbers) | ||
|
Comment on lines
+49
to
+56
|
||
|
|
||
| for _, member := range myHousehold.Members { | ||
| assignedTasks := myHousehold.GetAssignedTasks(member) | ||
| message := planner.CreateDailyTaskMessage(assignedTasks, member) | ||
|
|
||
| if debug { | ||
| pretty.Println("[DEBUG] member: ", member) | ||
| pretty.Println("[DEBUG] phoneNumber: ", member.PhoneNumber) | ||
| pretty.Println("[DEBUG] JID: ", JIDs[member.PhoneNumber]) | ||
| pretty.Println("[DEBUG] message: ", message) | ||
|
|
||
| } else { | ||
| JID := JIDs[member.PhoneNumber] | ||
| waMessage := &waE2E.Message{Conversation: proto.String(message)} | ||
| _, err := client.SendMessage(context.Background(), JID, waMessage) | ||
| if err != nil { | ||
| fmt.Printf("[ERROR] Failed to deliver message to %s.\n", member.Name) | ||
| } | ||
| } | ||
|
Comment on lines
+69
to
+75
|
||
| } | ||
|
|
||
| // Send messages via twilio sms | ||
| } else { | ||
| client := planner.InitializeTwilioClient() | ||
| for _, member := range myHousehold.Members { | ||
| assignedTasks := myHousehold.GetAssignedTasks(member) | ||
| planner.SendMessageSms(client, member, assignedTasks, debug) | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.