Граф коммитов

7777 Коммитов

Автор SHA1 Сообщение Дата
Joas Schilling 6844da74a1
Merge pull request #4196 from nextcloud/bugfix/noid/matterbridge
Bugfix/noid/matterbridge
2020-09-22 22:39:08 +02:00
Joas Schilling 618280a462
Merge pull request #4187 from nextcloud/feature/4184/cache-the-last-message-id
Cache the last msg id of a chat in MemoryCache to save O(n) queries p…
2020-09-22 22:37:55 +02:00
Joas Schilling 5bd5779d35
Merge pull request #4189 from nextcloud/feature/noid/less-participant-queries
Less participant queries
2020-09-22 21:11:53 +02:00
Joas Schilling 112dd2e1b3
Merge pull request #4198 from nextcloud/fix/change_upload_button
Change the upload button name from upload to send
2020-09-22 20:29:19 +02:00
Joas Schilling a07ca6bc9f
Merge pull request #4200 from nextcloud/bugfix/noid/save-count-unread-message-query
Save the "count unread messages" query, when the last read is the las…
2020-09-22 20:28:52 +02:00
Joas Schilling b3394e6235
Save the "count unread messages" query, when the last read is the last room messages
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-22 19:52:43 +02:00
Joas Schilling acc5c7e989
Use existing translations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-22 18:29:25 +02:00
Joas Schilling 20737ff49e
Merge pull request #4197 from nextcloud/bugfix/noid/fix-missing-parent-constructor-call
Fix missing parent constructor call
2020-09-22 18:22:21 +02:00
Joas Schilling 2b0db36f5a
Fix migration
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-22 18:16:49 +02:00
Joas Schilling 963dace314
PHPStorm to the rescue
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-22 18:15:55 +02:00
Joas Schilling 5817fdf1a7
Don't error when a room was deleted
Can't delete the bridge atm as we dont have a room object

Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-22 18:07:11 +02:00
Joas Schilling ac1ce3c885
Make the queries simpler with the new columns
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-22 18:07:10 +02:00
Joas Schilling b94ae2cb92
Simplify migration
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-22 18:06:13 +02:00
Julien Veyssier 6cd3fdd720
get 'enabled' and 'pid' bridge values out of json_values
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
2020-09-22 17:53:17 +02:00
GretaD 39c0c0a393 Change upload to send
Signed-off-by: GretaD <gretadoci@gmail.com>
2020-09-22 16:05:14 +02:00
Joas Schilling c0227ea0bb
Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-22 15:58:20 +02:00
Joas Schilling 0846c6a5a8
Fix missing parent constructor call
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-22 15:47:19 +02:00
Joas Schilling 168dda1ac7
Reduce the load when detecting and killing zombies
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-22 15:44:56 +02:00
Joas Schilling ef34d96ff0
Loop over the enabled bridges instead of all rooms
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-22 15:33:40 +02:00
Joas Schilling fb12c7378b
Better scaling version of stopAllBridges
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-22 15:22:34 +02:00
Joas Schilling 287e54f433
Set a limit on the query
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-22 15:07:51 +02:00
Joas Schilling bc1ffd82d7
Remove unused var
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-22 15:04:33 +02:00
Joas Schilling 8f9b409433
Stop all bridges when integration is disabled
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-22 14:58:20 +02:00
Joas Schilling 35492fab8f
Fix missing parent::__construct() call
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-22 14:51:05 +02:00
Joas Schilling c01ff3fa24
Don't loop over the rooms when we kill all anyway
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-22 14:46:26 +02:00
Joas Schilling ce87e93999
When no bridges are running we are done
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-22 14:45:15 +02:00
Joas Schilling af9fa0de1f
Remove unused methods and members and define all members
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-22 14:38:19 +02:00
Joas Schilling eec77f3060
Fix undefined variables and classes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-22 14:34:00 +02:00
Joas Schilling 9a599f12ce
Allow to preload a user when getting the room by token
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-22 13:08:56 +02:00
Daniel Calviño Sánchez 13b93a53b8
Merge pull request #4188 from nextcloud/bugfix/4186/also-return-the-conversation-data-when-the-room-exists-already
Also return the conversation data when the room exists already
2020-09-22 12:21:26 +02:00
Joas Schilling 86d06fab31
Adjust unit test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-22 07:48:36 +02:00
Nextcloud bot 64c66e7ba1
[tx-robot] updated from transifex 2020-09-22 03:10:19 +00:00
Joas Schilling 8786e1d601
Merge pull request #4190 from nextcloud/feature/noid/no-guests-no-query
If there are no sessions, we don't need to run a query
2020-09-21 19:03:06 +02:00
Joas Schilling 5c9e293f1a
If there are no sessions, we don't need to run a query
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-21 17:31:11 +02:00
Joas Schilling 18efd34430
Free the database connection in case we are waiting with the cache
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-21 16:21:10 +02:00
Joas Schilling 5f2dfbf3e6
Don't break on other errors
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-21 15:59:38 +02:00
Joas Schilling 00c6a516e2
Also return the conversation data when the room exists already
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-21 15:55:19 +02:00
Joas Schilling d3338a829e
Cache the last msg id of a chat in MemoryCache to save O(n) queries per second
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-21 15:39:41 +02:00
Julien Veyssier 44945778ba
Merge pull request #4185 from nextcloud/bugfix/noid/fix-irc-bridge
Fix IRC nickserv credentials
2020-09-21 11:16:38 +02:00
Joas Schilling d34240c027
Fix IRC nickserv credentials
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-21 10:27:39 +02:00
Nextcloud bot b6e1015362
[tx-robot] updated from transifex 2020-09-20 03:05:06 +00:00
Joas Schilling e75281988b
Merge pull request #4178 from nextcloud/dependabot/npm_and_yarn/webpack-4.44.2
Bump webpack from 4.44.1 to 4.44.2
2020-09-19 10:46:47 +02:00
Joas Schilling ac0dc3f353
Merge pull request #4180 from nextcloud/dependabot/npm_and_yarn/ua-parser-js-0.7.22
Bump ua-parser-js from 0.7.21 to 0.7.22
2020-09-19 10:46:27 +02:00
Nextcloud bot 086e8646b9
[tx-robot] updated from transifex 2020-09-19 03:06:46 +00:00
dependabot-preview[bot] 7aaa807251
Bump ua-parser-js from 0.7.21 to 0.7.22
Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.21 to 0.7.22.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.21...0.7.22)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-19 01:22:26 +00:00
dependabot-preview[bot] 05ac22609e
Bump webpack from 4.44.1 to 4.44.2
Bumps [webpack](https://github.com/webpack/webpack) from 4.44.1 to 4.44.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.44.1...v4.44.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-19 01:18:58 +00:00
Joas Schilling 50ca4054d7
Merge pull request #4177 from nextcloud/update-master-version
Update version on master
2020-09-18 20:26:52 +02:00
Joas Schilling 2cfc67466e
Run "npm install" to update version
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-18 14:27:49 +02:00
Joas Schilling 1b7a454676
Update version on master
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-18 10:53:42 +02:00
Nextcloud bot 9156164dab
[tx-robot] updated from transifex 2020-09-18 03:03:19 +00:00