-
Notifications
You must be signed in to change notification settings - Fork 508
[PoC] [WIP] Matterbridge integration #4010
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
55 commits
Select commit
Hold shift + click to select a range
e1937ef
first working state of matterbridge PoC, server side only
5486c64
check if participant is moderator for all bridge related actions
15b94b4
implement UI for matterbridge management
2fa346e
add 'check all' bridge manager method
ec55933
fix relaunch when check, add new default part for my room, clean matt…
5532cfb
small design improvement
da8730d
check bridge process when getting it
784323d
implement method to kill zombie matterbridge processes
328fe65
stupid
2504198
Adjust the design of bridge basic settings
gary-kim 7c588e9
design detail
b3399bc
php lint
3b2845d
add label to all inputs
71b0414
add a few systems
ebb2d83
factorize parts in one versatile component
b76e7ee
avoid deletion of my part
0eb911c
add discord and telegram
2b0ad77
add steam
f1f78e7
add zulip
67f6aa5
first round of design fixes
c2df67b
add info links (to mb doc) for all bridge type
b550604
simplify part management now that there is no local part in UI, get r…
8b1d5fa
fix after first review
6b824b4
lint fix
09b053e
create bot user if it does not exist
01a0114
begin to manage bot access token
a960586
generate new room-specific app token when enabling bridge, revoke all…
ae873eb
add doc
18ab5f2
new DB table to store bridge configs
260494d
set avatar to brige bot user
298f0d9
review fixes
824674a
directly load image content
a8c3f51
change config key for bot password
c1d761c
rebased to get settings tab, + another round of fixes
efb28a4
improve insert/update in bridge table
f931672
Use room object from enviroment
nickvergessen df0f9ec
log debug info, level 1
9b83640
lint fix
9ed27b3
basic toggle matterbridge via admin settings
8013641
stop all bridges when disabling admin setting
452c7dc
lint
4bacb51
lint2
90d758c
lint3
4ecff56
Adjust design of Matterbridge integration
jancborchardt 9a94fb3
tab replacement
6d0b2c8
Allow to install the Matterbridge app directly in the Talk settings
nickvergessen 6ee5c04
Move stopAllBridges to a controller without a Room
nickvergessen be31ca6
Fix migration
nickvergessen 791f831
Only available for admins
nickvergessen d112702
Simple ticks without parameters
nickvergessen 1c8004f
Add a description to the admin settings
nickvergessen f1269e0
settings routes before conversation specific ones
nickvergessen 4ad2f3b
Make installing feel smoother and explain the timeout
nickvergessen a7ca2c7
Rename to Matterbridge everywhere
nickvergessen 4700152
Fix unit tests
nickvergessen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
new DB table to store bridge configs
Signed-off-by: Julien Veyssier <[email protected]>
- Loading branch information
commit 18ab5f212e5063fbc5a1c5f7d0e0e7972b46b505
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
| /** | ||
| * @copyright Copyright (c) 2020, Julien Veyssier <[email protected]> | ||
| * | ||
| * @author Julien Veyssier <[email protected]> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OCA\Talk\Migration; | ||
|
|
||
| use Closure; | ||
| use Doctrine\DBAL\Types\Type; | ||
| use OCP\DB\ISchemaWrapper; | ||
| use OCP\Migration\IOutput; | ||
| use OCP\Migration\SimpleMigrationStep; | ||
|
|
||
| class Version10000Date20200819121721 extends SimpleMigrationStep { | ||
| /** | ||
| * @param IOutput $output | ||
| * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` | ||
| * @param array $options | ||
| * @return null|ISchemaWrapper | ||
| */ | ||
| public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) { | ||
| /** @var ISchemaWrapper $schema */ | ||
| $schema = $schemaClosure(); | ||
|
|
||
| if (!$schema->hasTable('talk_bridges')) { | ||
| $table = $schema->createTable('talk_bridges'); | ||
| $table->addColumn('id', Type::INTEGER, [ | ||
| 'autoincrement' => true, | ||
| 'notnull' => true, | ||
| 'length' => 11, | ||
julien-nc marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| ]); | ||
| $table->addColumn('room_id', Type::INTEGER, [ | ||
| 'notnull' => true, | ||
| 'length' => 11, | ||
| 'unsigned' => true, | ||
| 'default' => 0, | ||
julien-nc marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| ]); | ||
| $table->addColumn('json_values', Type::STRING, [ | ||
| 'notnull' => true, | ||
| 'length' => 10000, | ||
| 'default' => '{}', | ||
julien-nc marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| ]); | ||
| $table->addIndex(['room_id'], 'tbr_room_id'); | ||
| } | ||
|
|
||
| return $schema; | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.