Skip to content

Update Whatsapp Bridge to latest Whatsmeow#13

Merged
poVoq merged 3 commits into
matterbridge-org:masterfrom
luneflu:master
Nov 25, 2025
Merged

Update Whatsapp Bridge to latest Whatsmeow#13
poVoq merged 3 commits into
matterbridge-org:masterfrom
luneflu:master

Conversation

@luneflu

@luneflu luneflu commented Nov 17, 2025

Copy link
Copy Markdown

No description provided.

@selfhoster1312

Copy link
Copy Markdown
Collaborator

Hello, thanks for the contribution ! Have you by any chance tested these changes? Sorry i messed the master branch for some unrelated reasons (totally not your fault) can you maybe rebase on the new one?

git fetch origin
# Only pick your commit, delete the other lines
git rebase -i origin/master

@selfhoster1312

Copy link
Copy Markdown
Collaborator

Otherwise the changes look very straightforward so that's good for me :)

@luneflu luneflu closed this Nov 25, 2025
@luneflu luneflu reopened this Nov 25, 2025
@luneflu

luneflu commented Nov 25, 2025

Copy link
Copy Markdown
Author

Hi, I fixed the conflict and it's already tested. I used it currently for my server 😄

@poVoq

poVoq commented Nov 25, 2025

Copy link
Copy Markdown
Collaborator

Looks generally good to me, but it seems like we introduced another minor merge conflict.

@luneflu

luneflu commented Nov 25, 2025

Copy link
Copy Markdown
Author

Yes, I tested the build and turns out the go mod version were duplicated. It should be fixed now with the latest commit. I already tested the build

@selfhoster1312

Copy link
Copy Markdown
Collaborator

That's actually not the problem. You merged master instead of rebasing on it, which btw is when the duplicate go version was introduced. Just do git rebase -i origin/master, and drop (d) all commits except efb8, then force push to your branch and we should be all good!

Thanks for taking the time to make this PR, and to actually test the changes :)

@luneflu

luneflu commented Nov 25, 2025

Copy link
Copy Markdown
Author

There, I fixed the commit to mine and resolved the go mod conflicts. The go mod updates should be fine, right?

@poVoq poVoq merged commit f6e4e03 into matterbridge-org:master Nov 25, 2025
6 checks passed
@selfhoster1312

Copy link
Copy Markdown
Collaborator

That's perfect, thank you. If you are a regular whatsapp/matterbridge user, would you like to be registered as a maintainer for the whatsapp bridge @alvindimas05 ? Right now it doesn't add special responsibilities, it mostly means we'll ping you to review/test stuff when someone touches the whatsapp bridge.

If you're interested to help out in this manner, please post a comment in matterbridge-org/community#1 so we can update the list.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants