Commit Graph

61 Commits

Author SHA1 Message Date
Max Sandholm
e98b7312f6 Correctly use the re.sub function 2017-09-21 14:39:50 +03:00
Max Sandholm
3a21a819b9 Merge branch 'master' of github.com:vurpo/telematrix 2017-09-21 13:36:49 +02:00
Max Sandholm
828f92e37b Fix escaping error 2017-09-21 14:36:37 +03:00
Max Sandholm
2ee824f4ca Merge branch 'master' of github.com:vurpo/telematrix 2017-09-21 13:31:33 +02:00
Max Sandholm
8e422d683b Merge branch 'master' of github.com:vurpo/telematrix 2017-09-21 13:30:23 +02:00
Max Sandholm
d537cfb1b3 Fix quoting formatting and change Matrix->Telegram username formatting 2017-09-21 13:29:26 +02:00
Max Sandholm
09945d75cc Replace Matrix mentions with Telegram mentions (ping) 2017-09-21 13:50:17 +03:00
Max Sandholm
b0aeb11e8a Merge branch 'master' of https://github.com/SijmenSchoon/telematrix 2017-09-21 11:13:44 +03:00
Jan Christian Grünhage
5a4b21db77 Add some documentation for bridging rooms (#30)
There was no information on how to do this, and while it is common knowledge around those who actively use the bridge, it would be better if it was properly documented. Open for suggestions on how to improve on this.
2017-09-05 14:20:48 +02:00
Max Sandholm
18c5a5cd7b Update bridged displaynames and profile pictures (#27)
* Telegram profile pictures and display names are updated

The bridge updates the displayname and/or the avatar of the bridged Matrix
user when the Telegram user changes them.

This is done by checking the name and profile pic of the sender when a message
is received from Telegram, and comparing to the database to see if they have
changed. If they have, it will update the database and send the updates to the
Matrix homeserver.

* Handle users without profile pictures correctly

* Fix aliases-related breakage
2017-04-22 11:33:33 +02:00
Max Sandholm
fea8d89493 Fix aliases-related breakage 2017-04-08 13:32:19 +03:00
Max Sandholm
15e84f6861 Handle users without profile pictures correctly 2017-04-04 00:07:07 +03:00
Max Sandholm
fc65d5f0f5 Telegram profile pictures and display names are updated
The bridge updates the displayname and/or the avatar of the bridged Matrix
user when the Telegram user changes them.

This is done by checking the name and profile pic of the sender when a message
is received from Telegram, and comparing to the database to see if they have
changed. If they have, it will update the database and send the updates to the
Matrix homeserver.
2017-04-03 22:12:03 +03:00
Max Sandholm
89779b4da7 Added reply bridging (#26)
Messages sent from Telegram that are replies to previous messages are now formatted better on Matrix:
The message contains a link to the replied-to message on Matrix, so clicking on it works just like it does on Telegram
Also, the reply quotes the original message.
2017-03-05 12:51:32 +01:00
Max Sandholm
b67d0733d9 Add rudimentary sticker support (#25)
* Add initial sticker support
* Add Pillow to requirements.txt
2017-02-20 00:19:40 +01:00
Sijmen Schoon
7cfac1504c Fix tiny mistake 2017-01-20 16:38:53 +00:00
Sijmen Schoon
995f0a6e3d Fix image replies and image captions.
Fixes #16
2017-01-20 16:35:09 +00:00
Sijmen Schoon
fcdc5a2fd2 Add image extension if missing, fix join swallowing msgs 2017-01-09 18:46:53 +00:00
Sijmen Schoon
88769a95b7 Hardcode images to jpeg
For some reason, Telegram now sets the mimetype of images to application/octet-stream, breaking the extension detection. Hardcoding it to jpeg is a dirty but effective solution.
2017-01-05 16:25:27 +00:00
Sijmen Schoon
8fc4b5902b Fix some crashes 2017-01-05 01:08:02 +00:00
Sijmen Schoon
2d317d1044 Merge branch 'master' of github.com:SijmenSchoon/telematrix 2016-11-27 10:18:56 +00:00
Sijmen Schoon
cba7594283 Discard old Matrix messages and reduce verbosity 2016-11-27 10:18:49 +00:00
Sijmen Schoon
023367b72b Fix no-member error in matrix_room 2016-11-27 01:20:41 +01:00
Sijmen Schoon
5bcaf1ba74 Phase out TELEGRAM_CHATS and MATRIX_ROOMS 2016-11-27 01:13:09 +01:00
Sijmen Schoon
ad842ada4d Fix links not getting added to the database 2016-11-27 00:07:40 +00:00
Sijmen Schoon
c705e8823c Add try-except around matrix_transaction 2016-11-22 15:59:29 +00:00
Sijmen Schoon
bc5269c7be Support displayname changes 2016-11-17 10:33:22 +00:00
Sijmen Schoon
29fa9086c6 Fix crash 2016-11-16 14:08:55 +00:00
Sijmen Schoon
a1ca8d48cd Fix CI 2016-11-16 14:47:13 +01:00
Sijmen Schoon
6ef0a343c8 Move files to a module 2016-11-16 13:50:13 +01:00
Sijmen Schoon
3324257e35 Add last bit of configuration documentation.
Fixes #7
2016-11-15 15:26:21 +01:00
Sijmen Schoon
354b44a07e Add asconfig explanation to README.md 2016-11-15 10:12:30 +01:00
Sijmen Schoon
7e17dd60c2 Remove random spacing in readme 2016-11-15 10:07:52 +01:00
Sijmen Schoon
34febdac1f Fix readme 2016-11-15 10:06:41 +01:00
Sijmen Schoon
5af3faf9a3 Improve forward and reply messages 2016-11-15 08:28:42 +01:00
Sijmen Schoon
fe5f913ab9 Fix Telegram forwards 2016-11-15 07:00:00 +00:00
Sijmen Schoon
9f805b87cb Add database to gitignore 2016-11-15 07:53:43 +01:00
Sijmen Schoon
e9f166ee1b Add a bit more documentation 2016-11-15 07:45:09 +01:00
Sijmen Schoon
fa390b69c5 Make Google API token optional
Fixes #11
2016-11-15 07:36:36 +01:00
Sijmen Schoon
935fada1c5 Use a database for links, allowing for automatic configuration
Fixes #6
2016-11-15 00:52:00 +01:00
Sijmen Schoon
08c8a88721 Add travis pylint CI 2016-11-14 11:22:22 +01:00
Sijmen Schoon
df535efdc1 Replace hyphens with emdashes 2016-11-14 11:14:36 +01:00
Sijmen Schoon
68b6bbe6a4 Merge pull request #10 from Flippylosaurus/master
Fixes #9
2016-11-14 11:09:48 +01:00
Sijmen Schoon
873bd6f101 Remove trailing space 2016-11-14 11:07:26 +01:00
Sijmen Schoon
186cad8931 Add requirements.txt and update README a bit 2016-11-14 11:06:16 +01:00
Sijmen Schoon
0f39b8881c Merge branch 'master' of github.com:SijmenSchoon/telematrix 2016-11-12 02:33:59 +00:00
Sijmen Schoon
8bb396b44e Several improvements 2016-11-12 02:33:51 +00:00
Sijmen Schoon
dad1d6a37a Merge pull request #8 from Flippylosaurus/master
added example configuration
2016-10-08 18:15:06 +02:00
Hillebrand van de Groep
0fd1d45e9b added example configuration 2016-10-08 18:08:59 +02:00
Sijmen Schoon
3b1c26cb7d Merge branch 'master' of github.com:SijmenSchoon/telematrix 2016-09-26 11:59:47 +02:00