845af9008c
Ignore asconfig.yaml
2017-10-30 10:39:47 -04:00
e5545ac9be
Merge branch 'bot-owners' into develop
2017-10-30 10:39:05 -04:00
c25e34ebc3
Fix small config load issue with bot owners
2017-10-30 10:38:57 -04:00
532c3af254
Merge branch 'bot-owners' into develop
2017-10-30 10:32:19 -04:00
9ce2aa35ca
Final if fix
2017-10-30 10:31:23 -04:00
b8e3eb6bf4
Merge branch 'bot-owners' into develop
2017-10-30 10:27:24 -04:00
b41badee88
Correct bot-owner if statements
2017-10-30 10:27:17 -04:00
7da7bc0baa
Merge branch 'no-show-image-url' into develop
2017-10-30 10:19:14 -04:00
ac924fa420
Fix json formatting
2017-10-30 10:19:10 -04:00
55f0487391
Merge branch 'report-failed-join' into develop
2017-10-30 10:14:51 -04:00
8ad042dbb9
Merge no-show-image-url
2017-10-30 10:14:32 -04:00
fad2be42ef
Merge branch 'bot-owners' into develop
2017-10-30 10:10:32 -04:00
f44c06daa0
Implement no-show-image-url
2017-10-30 10:09:45 -04:00
af7731f00e
Document no-show-image-url
2017-10-30 10:09:35 -04:00
e20654668b
Implement bot owners
2017-10-26 11:54:51 -04:00
30b5c6d3c6
Document bot-owners to allow some users to send messages without a prefix
2017-10-26 11:39:06 -04:00
7b8def4107
Log to console when a user cannot join a room
2017-10-26 11:26:51 -04:00
67647026ac
Allow custom port for homeserver
2017-10-24 16:49:51 -04:00
Sijmen Schoon
8e85ba99e5
Make Matrix AS port configurable. Fixes #35
2017-10-19 00:39:31 +02:00
Sijmen Schoon
24e8ae9670
Merge pull request #41 from expectocode/typo
...
Fix 'brigde' typo
2017-10-15 23:43:54 +02:00
Tanuj
9bdba4108f
Fix 'brigde' typo
2017-10-15 19:41:09 +01: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
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
