uwaru/matterbridge
1
0
Fork 0
forked from jshiffer/matterbridge
Code Pull Requests Activity
1,403 Commits 1 Branch 116 Tags 281 MiB
8eba2d3e50
Commit Graph

706 Commits

Author SHA1 Message Date
Wim
7f7ca697a0
Ignore non-user messages (msteams). Fixes #1141 (#1149) 
Ignore these messages for now, also add a extra
debug option for msteams so we can dump the whole
message.
 2020-05-24 15:49:24 +02:00
Alexander
900375679b
Prevent re-requesting avatar data (xmpp) (#1117) 
Prevent asking the server again and again for a
user's avatar if the server does not respond to
our initial request.
 2020-05-24 14:07:36 +02:00
Wim
393f9e998b
Update dependencies / vendor (#1146) 2020-05-24 00:06:21 +02:00
Wim
ba0bfe70a8
Add StripMarkdown option (irc). (#1145) 
Enable `StripMarkdown` to strip markdown for irc.
 2020-05-23 21:46:15 +02:00
Wim
3c4a3e3f75
Implement xep-0245 (xmpp). Closes #1137 (#1144) 2020-05-23 20:51:04 +02:00
Wim
274fb09ed4
Fix forward from hidden users (telegram). Closes #1131 (#1143) 
Use ForwardDate to check if a message is forwarded.
If we have a nil ForwardedFrom then make this an unknown user.
 2020-05-23 19:15:26 +02:00
Wim
d44598a900
Add an option to disable sending HTML to matrix. Fixes #1022 (#1135) 2020-05-14 00:37:41 +02:00
Wim
c9cfa59f54
Do not use webhooks when token is configured (slack) (fixes #1123) (#1134) 2020-05-14 00:27:34 +02:00
Tiago Epifânio
7062234331
Avoid creating invalid url when the user doesn't have an avatar (matrix) (#1130) 2020-05-11 00:21:56 +02:00
Qais Patankar
9754569525
Fix webhook EventUserAction messages being skipped (discord) (#1133) 
Fixes #1132
 2020-05-11 00:20:35 +02:00
Qais Patankar
52a071e34d
Fix #1049: missing space before embeds (discord) (#1124) 2020-05-07 00:19:48 +02:00
Qais Patankar
2d8f749e36
Fix #1120: replaceAction "_" crash (discord) (#1121) 2020-04-25 14:22:22 +02:00
Wim
eaf92fca4d
Add an ID cache (discord). Fixes #1106 (#1111) 
When a webhook "edits" a message, it does this by deleting the message
and creating a new one with the new content.

On creation of this new message, we'll get another ID then already is
know by the gateway in its id cache. So we add it in our own cache and
replace it whenever we want to edit/delete it again.
 2020-04-21 23:35:46 +02:00
Wim
d99c54343a
Remove panics and retry polling on failure (msteams). Fixes #1104 (#1105) 2020-04-21 19:29:24 +02:00
Wim
e564c555d7
Clip too long messages on 3000 length (slack). Fixes #1081 (#1102) 2020-04-19 17:00:11 +02:00
Wim
f7ec9af9e8
Add extra space before colon in attachments (irc). Fixes #1089 (#1101) 2020-04-19 16:45:53 +02:00
Wim
4d93a774ce
Ignore non-critical errors (whatsapp). Fixes #1094 (#1100) 2020-04-19 13:45:35 +02:00
Wim
9190365289
Add JoinDelay option (irc). Fixes #1084 (#1098) 2020-04-19 00:46:35 +02:00
Wim
57794b3b9f
Prevent image/message looping (slack). Fixes #1088 (#1096) 
Also check for our matterbridge ID in Blocks set in SubMessages.
 2020-04-18 22:30:49 +02:00
ldruschk
8e6ddadba2
Relay Joins/Topic changes in RocketChat bridge (#1085) 
This pull request properly sets the events EventJoinLeave and EventTopicChange for messages from the RocketChat bridge and drops messages which are neither one of those events nor plain messages.
 2020-04-18 22:00:35 +02:00
Alexander
7183095a28
Implement User Avatar spoofing of XMPP users (#1090) 
* Implement User Avatar spoofing of XMPP users
 2020-04-16 22:16:25 +02:00
Wim
8950575bfb
Update Rhymen/go-whatsapp vendor and whatsapp version (#1078) 2020-04-09 22:30:08 +02:00
Wim
8d08e348a9
Reset start timestamp on reconnect (whatsapp). Fixes #1059 (#1064) 2020-03-31 23:26:53 +02:00
Wim
29f658fd3c Use DebugWriter after upstream changes (xmpp) 2020-03-29 15:03:24 +02:00
Wim
0df2539641
Use upstream yaegashi/msgraph.go/msauth (msteams) (#1067) 2020-03-28 23:44:49 +01:00
Wim
1aa662f763
Update client version whatsapp. Fixes #1061 (#1062) 
See https://github.com/Rhymen/go-whatsapp/issues/305
 2020-03-28 00:18:03 +01:00
Qais Patankar
98033b1ba7
Don't transmit typing events from ourselves (slack/discord) (#1056) 2020-03-22 18:39:11 +01:00
Qais Patankar
af0acf0dae
Strip extra info from emotes (discord) (#1052) 2020-03-22 14:16:31 +01:00
Qais Patankar
802c80f40c Update vendor yaegashi/msgraph.go to v0.1.2 (1) 2020-03-22 00:02:48 +01:00
Wim
281016a501
Fix duplicate separator on empty description/url (discord). Fixes #1008 (#1035) 
Make this work for all possible cases.
Add tests
 2020-03-21 21:27:17 +01:00
Qais Patankar
d4acdf2f89
Use blocks not attachments (slack) (#1048) 
This removes the extra space below messages, as shown in
https://user-images.githubusercontent.com/923242/77235190-a3359980-6bab-11ea-8b7b-697d730ae5c1.png
 2020-03-21 21:03:12 +01:00
Qais Patankar
0951e75c85
Fix #1039: messages sent to Slack being synced back (#1046) 
This is a regression from https://github.com/42wim/matterbridge/pull/581#issuecomment-562937576

Behaves the same as 95190f11bf
 2020-03-21 20:12:30 +01:00
Jakub
6b017b226a
Support JSON and YAML config formats (#1045) 
Signed-off-by: Jakub Sokołowski <jakub@status.im>
 2020-03-18 23:20:29 +01:00
Qais Patankar
9e3bd7398c
Fix #1027: warning when handling inbound webhooks (discord) (#1044) 2020-03-18 23:12:48 +01:00
Qais Patankar
79f764c7a8 Refactor webhook permission checks 2020-03-18 23:10:47 +01:00
Qais Patankar
b5dc4353fb Fix #1040: spotty webhook permission verification 2020-03-18 23:10:47 +01:00
Qais Patankar
2fbac73c29
Ignore ConnectingEvent (slack) (#1041) 2020-03-18 23:03:20 +01:00
Wim
9785edd263
Remove replace directives and use own fork to make go get work again (#1028) 
See https://github.com/golang/go/issues/30354
go get doesn't honor the go.mod replace options.
 2020-03-08 17:08:18 +01:00
Wim
3f06a40bd5 Support code snippets from msteams 2020-03-01 22:19:33 +01:00
Wim
68f43985ad Add scopes again 2020-03-01 22:19:33 +01:00
Wim
915ca8f817 Make linter happy and cleanup (msteams) 2020-03-01 22:19:33 +01:00
Wim
a65a81610b Support threading from other bridges to msteams 2020-03-01 22:19:33 +01:00
Wim
8eb6ed5639 Support receiving attachments from msteams 2020-03-01 22:19:33 +01:00
Wim
795a8705c3 Add initial Microsoft Teams support 
Documentation on https://github.com/42wim/matterbridge/wiki/MS-Teams-setup
 2020-03-01 22:19:33 +01:00
Wim
250b3bb579
Use upstream slack-go/slack again (#1018) 2020-03-01 20:59:19 +01:00
Wim
e343db6f72
Make avatars download work with mediaserverdownload (telegram). Fixes #920 (#1012) 2020-02-15 18:31:40 +01:00
Wim
54ed6320c2 Add support for avatars from matrix. #984 (#1007) 2020-02-10 00:06:54 +01:00
Wim
1985873494 Implement basic reconnect (whatsapp). Fixes #987 (#1003) 2020-02-09 22:11:46 +01:00
Qais Patankar
8ae5917659
Be less lossy when throttling IRC messages (#1004) 
Note that msg.Text and chucking it through a chan is OK: https://play.golang.org/p/MTfT3YSsgPX
 2020-02-09 22:10:18 +01:00
Qais Patankar
c91bfd08d8 Add ability to procure avatars from the destination bridge (#1000) 
* remote_avatar: add UseLocalAvatar

* remote_avatar: make sure msg.Protocol is always set correctly

* remote_avatars: support msg.Account

* remote_avatar: add to matterbridge.toml.sample

* remote_avatar: clarify something
 2020-02-09 22:07:26 +01:00
Wim
c01c8edeb8 Fix go-keybase-chat-bot api changes 2020-02-08 18:33:05 +01:00
Qais Patankar
1420f68050 Check only bridged channels for PermManageWebhooks (discord) (#1001) 
* Check only bridged channels for PermManageWebhooks

* add note
 2020-02-08 15:13:23 +01:00
Martijn Braam
c0be3e585a
Enable intra-word emphasis supression in markdown (#999) 
This fixes plain links sent to Matrix being broken if they contain
underscores. Fixes issue #997
 2020-02-04 13:22:05 +01:00
Wim
1bf46b7711
Fix duplicated messages (sshchat). Fixes #950 (#996) 2020-02-02 22:08:37 +01:00
Wim
b85bae31d9
Show file comment in webhook if normal message is empty (discord). Fixes #962 (#995) 2020-02-02 21:14:54 +01:00
Wim
f8ad877601
Add DisableWebPagePreview option (telegram). Closes #980 (#994) 2020-02-02 18:53:04 +01:00
Wim
585d1556c1
Disable smartypants in markdown parser. Fixes #989, #983 (#993) 2020-02-02 18:35:43 +01:00
Wim
7486555875
Fail with message instead of panic. #988 (#991) 2020-02-01 15:23:50 +01:00
Humorhenker
fc30b1bacc
Add QuoteLengthLimit option (telegram) fixes #963 (#985) 
* QuoteLengthLimit option added to limit max. quoted message length if QuoteLengthLimit = 0 the whole message will be quoted
 2020-01-30 00:02:33 +01:00
Wim
4c44515f9d
Fix channel ID problem with multiple gateways (discord). Fixes #953 (#977) 2020-01-09 23:54:04 +01:00
Guillaume Lazzara
c9d5f4c898 Add support for WhatsApp media (jpeg/png/gif) bridging (#974) 
* Whatsapp image bridging

* Prevent double message in telegram when media with caption received

Co-authored-by: imShara <shara@protonmail.com>
 2020-01-09 18:14:01 +01:00
c0ncord2
810c150781 move stripCustomoji logic to default Tengo script (#973) 
*  move stripCustomoji logic to default Tengo script 

Removing the image ID from the message (without any possibility of recovering it later) is a loss of valuable data that prevents users from giving support to custom emoji via Tengo scripts.

* bugfix - do send colors to other irc bridges

"if we're not sending to an irc bridge we strip the IRC colors"

Co-authored-by: c0ncord <59654954+c0ncord@users.noreply.github.com>
 2020-01-09 18:02:53 +01:00
Wim
1f830963f6
Return when we have only WebhookURL (mattermost). Fixes #954 (#960) 2019-12-15 23:49:17 +01:00
Benjamin
0917dc8766 Update markdown parsing library to github.com/gomarkdown/markdown (#944) 2019-11-17 21:18:01 +01:00
Gonçalo Ribeiro
c394de0c88 Add support for receiving attachments (keybase) (#923) 2019-11-01 22:29:52 +01:00
Wim
0bc159341d
Update vendor (#932) 
* Update vendor

* Fix godiscord api change
 2019-10-27 01:45:57 +02:00
Wim
45bf1fd63a
Convert slack bold/strike to correct markdown (slack). Fixes #918 (#930) 2019-10-27 01:10:59 +02:00
Wim
ff0de85817
Remove obsolete file upload links (discord). Fixes #908 (#931) 
Since v1.16.0 we now can upload files via webhook.
Old way of showing files with webhook only setup can be removed.
 2019-10-27 01:10:43 +02:00
Wim
727fa9f929
Add support for uploading application/x and audio/x (matrix). Fixes #925 (#929) 2019-10-27 00:06:44 +02:00
Wim
00967a98ac
Fix panic on WebhookURL only setting (mattermost). Closes #916 (#917) 2019-10-04 01:01:24 +02:00
Qais Patankar
1d708ab351 Suppress unhandled HelloEvent message (slack) (#913) 2019-10-04 00:19:50 +02:00
Qais Patankar
ba6759010b Add UserTypingSupport (discord) (#914) 
* Add Discord to UserTypingSupport

* discord: start typing in a channel on EventUserTyping receive

* discord: emit EventUserTyping to gateway
 2019-10-04 00:18:56 +02:00
Wim
0abf4d5d5d
Specify correct GuildID on unknown user query (discord). Fixes #879 (#894) 2019-09-15 20:25:42 +02:00
Michal Suchánek
9b320cd43f Add token support (RocketChat) (#892) 
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
 2019-09-13 23:41:02 +02:00
Wim
28783a4146
Do configuration validation on start-up. Fixes #888 (#889) 
Fail if:
* we don't have any gateways configured
* we have gateways configured but with non-existing bridge configuration
* we have gateways configured without any configuration
 2019-09-09 23:48:00 +02:00
Wim
a3bee01e0a
Update dependencies (#886) 2019-09-07 22:46:58 +02:00
Wim
3562d4220c
Bail if incorrect Jid (xmpp). Fixes #869 (#883) 2019-09-07 21:36:25 +02:00
Wim
f66d5f1e58 Add extra debug info (discord) 2019-09-05 22:39:43 +02:00
MOZGIII
cec086994e Add support for sending files via webhook (discord) (#872) 2019-08-29 00:13:10 +02:00
cori hudson
921f2dfcdf Add initial Keybase Chat support (#877) 
* initial work on native keybase bridging

* Hopefully make a functional keybase bridge

* add keybase to bridgemap

* send to right channel, try to figure out received msgs

* add account and userid

* i am a Dam Fool

* Fix formatting for messages, handle /me

* update vendors, ran golint and goimports

* move handlers to handlers.go, clean up unused config options

* add sample config, fix inconsistent remote nick handling

* Update readme with keybase links

* Resolve fixmie errors

* Error -> Errorf

* fix linting errors in go.mod and go.sum

* explicitly join channels, ignore messages from non-specified channels

* check that team names match before bridging message
 2019-08-26 21:00:31 +02:00
Wim
79a006c8de
Fix regression (discord). Closes #864 (#866) 2019-07-29 23:37:38 +02:00
Wim
7d2e440c83
Add support for discord category channels (discord) (#863) 
This adds support for the discord category option that can be used
to group channels in. This means we can have multiple channels with
the same name.

We add the option to specify a category in the channel option of a
discord account under [[gateway]]

Besides channel="channel" or channel="ID:channelID", now also
channel="category/channel" can be specified.

This change remains backwards compatible with people that haven't
specified the category and incorporates the fix in #861
 2019-07-15 21:56:35 +02:00
Qais Patankar
5551f9d56f Fix discord channel & category name clash. #860 (#861) 2019-07-14 19:53:09 +02:00
Wim
1fb91c6316
Fix panic by checking slice bounds in handleEntities (telegram). Fixes #857 (#858) 
Besides the bound checking, this now also use utf16 as suggested by
https://github.com/go-telegram-bot-api/telegram-bot-api/issues/231
 2019-07-08 22:19:45 +02:00
Qais Patankar
e60949ff3f Support webhook message deletions (discord) (#853) 
* Support webhook message deletions (discord)

Messages sent via webhook can now be deleted. It seems it can do this
without any special permissions.

This copies discordgo.WebhookExecute and makes it support the returning
of discordgo.Message.

A pull request has been sent upstream, so we should use that if
@bwmariin accepts the pull request:

https://github.com/bwmarrin/discordgo/pull/663

Changes in behaviour (webhook mode only):
- Previously messages *edited* on other platforms would just be
retransmitted as a brand new message to Discord.
- Message *edits* will now be ignored.
- Debug: message edits will now print out a "permission error".

In the future it may be good to send an "message edited" react to those
webhook messages, so at least people know that the message was edited on
other platforms. (Even though it can't actually show the new message.)

Alternatively, message edits could just send a brand new message with a
link back to the old one. This is a little ugly but it would ensure that
Discord users are able to see the edited message. These "message edit
notifications" would be sent from the bot user (not from a webhook), so
we could edit the "edit notification" if subsequent edits to the
original message are made.
 2019-07-08 22:18:37 +02:00
Wim
cf3cddafab Keep connection state. Fixes #856 
Actually check if we're connected when trying to Send() a message.
Messages now will get dropped when not connected.

TODO: Ideally this should be in a ring buffer to retransmit when the
connection comes back up.
 2019-06-30 18:34:41 +02:00
Joona Hoikkala
80b4cec87a Add an option to skip the Mattermost server version check (#849) 
Adds SkipVersionCheck bool option for mattermost
 2019-06-16 16:23:50 +02:00
Qais Patankar
76c7b69e4e Support bulk deletions (discord) 2019-06-16 16:07:48 +02:00
Nick
7a3bb0e55c Verify TLS against JID domain, not the host. (xmpp) (#834) 
Partially fixes #820.

A full fix requires patching https://github.com/matterbridge/go-xmpp to use DNS SRV records.
 2019-06-14 01:10:43 +02:00
Wim
6e8f535e8b Fix logic (xmpp) 2019-06-14 00:44:31 +02:00
Wim
5619a75b05
Fix regression in autojoining with legacy tokens (slack). Fixes #651 (#848) 2019-06-14 00:42:55 +02:00
Wim
53dfb78215
Allow messages with timestamp (xmpp). Fixes #835 (#847) 2019-06-14 00:24:42 +02:00
Wim
8e97cbab1e Fix noisy whatsapp error logging 2019-06-14 00:02:32 +02:00
Wim
ce7b749fd5 Update github.com/Rhymen/go-whatsapp vendor. Fixes #843 2019-06-14 00:02:32 +02:00
Wim
6617bd6609 Revert xmpp to orig behaviour. Closes #844 2019-06-13 23:35:04 +02:00
Wim
e610fb3201 Make config parse errors readable 2019-06-02 09:35:20 +01:00
Wim
40f1d35415 Fix go mod issue by removing whatsapp-ext 2019-06-02 09:35:20 +01:00
Duco van Amstel
3724cc3a15 Clean-up XMPP handling code (#831) 2019-05-30 12:31:54 +02:00
Wim
3418e8c9af
Use upstream whatsapp again (#809) 2019-05-30 12:20:56 +02:00
Wim
1829dc3d9f Allow messages from other bots (discord). Fixes #816 2019-05-01 18:10:31 +02:00