Commit graph

79 commits

Author SHA1 Message Date
Joas Schilling
06b8063bc0
fix(matterbridge): Check parameters
Signed-off-by: Joas Schilling <coding@schilljs.com>
2025-12-11 12:53:13 +01:00
Joas Schilling
b17c7c96d6 fix(opengrep): Ignore some things in PHP
Signed-off-by: Joas Schilling <coding@schilljs.com>
2025-09-18 10:59:36 +02:00
Sanskar Soni
45adb4fe26 fix(message): support mention-all metadata in system messages
Signed-off-by: Sanskar Soni <sanskarsoni300@gmail.com>
2025-08-06 21:51:55 +05:30
Maksim Sukharev
2a46db7acb fix(matterbridge): skip TLS for NC Talk
- Matterbridge has two gateways:
  - local - always NC Talk - we 'trust' it and skip verifying
  - target - could be NC Talk (same or another) - checkbox is added to skip verifying

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
2024-11-14 14:07:58 +01:00
Joas Schilling
7ef1d423ab
chore(cs): Prepare coding-standard update
Signed-off-by: Joas Schilling <coding@schilljs.com>
2024-09-18 22:26:39 +02:00
Joas Schilling
956a1ab00f
chore(php): Auto-fixes of coding standards
Signed-off-by: Joas Schilling <coding@schilljs.com>
2024-08-23 16:36:50 +02:00
Joas Schilling
89c48bb278
fix(cs): Use single quotes for simple strings
Signed-off-by: Joas Schilling <coding@schilljs.com>
2024-07-31 12:24:31 +02:00
Joas Schilling
1ccbf67da2
chore: Run SPDX convertor
Signed-off-by: Joas Schilling <coding@schilljs.com>
2024-04-26 13:02:15 +02:00
Joas Schilling
93fe117ef1
Merge pull request #11189 from nextcloud/bugfix/noid/fix-duplicate-catches
fix(API): Fix duplicate exception catches
2023-12-11 15:14:29 +01:00
Joas Schilling
715633ba35
fix(matterbridge): Simplify "string starts with" check
Signed-off-by: Joas Schilling <coding@schilljs.com>
2023-12-11 12:41:51 +01:00
Joas Schilling
9aecf1faf1
fix(API): Fix duplicate exception catches
Signed-off-by: Joas Schilling <coding@schilljs.com>
2023-12-11 12:34:24 +01:00
Joas Schilling
4813069dda
fix(API): Move away from deprecated constants
Signed-off-by: Joas Schilling <coding@schilljs.com>
2023-11-22 21:34:27 +01:00
Joas Schilling
25e50e1a12
Adjust namespace and dictionary to match Talk
Signed-off-by: Joas Schilling <coding@schilljs.com>
2023-10-06 12:41:11 +02:00
jld3103
7e23a10256
Add annotations for utilities
Signed-off-by: jld3103 <jld3103yt@gmail.com>
2023-10-06 12:39:22 +02:00
Hamid Dehnavi
f7961b2e57 Update psalm baseline
Signed-off-by: Hamid Dehnavi <hamid.dev.pro@gmail.com>
Co-authored-by: Joas Schilling <coding@schilljs.com>
2023-07-14 15:57:30 +03:30
Hamid Dehnavi
58af8465d2 Make adjustments based on the psalm error
Signed-off-by: Hamid Dehnavi <hamid.dev.pro@gmail.com>
2023-07-11 16:53:53 +03:30
Hamid Dehnavi
8a850b6192 Use PHP8's constructor property promotion
Signed-off-by: Hamid Dehnavi <hamid.dev.pro@gmail.com>
2023-07-11 11:37:47 +03:30
Joas Schilling
9a5e08897f
fix(CI): Make psalm happy
Signed-off-by: Joas Schilling <coding@schilljs.com>
2023-07-04 11:36:17 +02:00
Joas Schilling
c1970caef4
chore(CS): Unify construct() calls
Signed-off-by: Joas Schilling <coding@schilljs.com>
2023-04-13 14:28:41 +02:00
Joas Schilling
f3ff4a8820
automated: Apply CS fix
Signed-off-by: Joas Schilling <coding@schilljs.com>
2023-04-13 13:17:49 +02:00
Joas Schilling
5f060687c8
Move getParticipant()
Signed-off-by: Joas Schilling <coding@schilljs.com>
2022-10-04 16:02:08 +02:00
Vitor Mattos
c07251f0c6
Use PHP7.4 property typehinting where possible
Signed-off-by: Vitor Mattos <vitor@php.rio>
2022-04-06 12:43:03 -03:00
Gary Kim
b885469c6c
Set avatar correctly
Signed-off-by: Gary Kim <gary@garykim.dev>
2021-07-14 13:44:31 -04:00
Gary Kim
aaf51b70b2
Show name for bridged messages
Signed-off-by: Gary Kim <gary@garykim.dev>
2021-07-14 13:44:27 -04:00
Gary Kim
968e7ccbfc
Add skip TLS option for XMPP and Rocketchat
Signed-off-by: Gary Kim <gary@garykim.dev>
2021-07-14 00:22:20 -04:00
Joas Schilling
ead986df53
Optimize imports
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-06-24 11:43:17 +02:00
Joas Schilling
9307412dc8
Adjust more database calls to the new methods
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-06-24 11:26:10 +02:00
Joas Schilling
56790b4b18
Don't spam the log when matterbridge is disabled
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-06-24 11:22:21 +02:00
Gary Kim
51d32f5fe6
Set permissions on Matterbridge config and log
Signed-off-by: Gary Kim <gary@garykim.dev>
2021-06-08 19:28:25 -04:00
Joas Schilling
ecc1d2a8f3
Add a global constant for the bots userId
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-04-30 10:52:36 +02:00
Joas Schilling
928e047de2
Handle all getParticipants with multi sessions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-03-08 11:56:21 +01:00
Joas Schilling
383ca5fd4c
Populate the display name when adding logged in users
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-02-12 07:34:35 +01:00
Julien Veyssier
6f88fb15ba
refs #4776 recreate matterbridge config file if missing when launching
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
2021-01-28 11:26:18 +01:00
Julien Veyssier
a43a891974
avoid double quotes in bridge bot app password, it messes with the toml file
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
2021-01-07 15:10:41 +01:00
Joas Schilling
b478c47e81
Merge pull request #4791 from nextcloud/fix/4549/complexify-bridge-bot-password
Make bridge bot password more complex
2020-12-18 13:21:20 +01:00
Vincent Petry
c40cccefeb
Adjust files to make cs fixer happy
Seems PHP CS fixer has some new rules or operations.
This fixes the code to match the new rules by running composer run
cs:fix.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-18 10:13:36 +01:00
Julien Veyssier
c542b38d5a
refs #4549 put uppercase letters in bridge bot password
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
2020-12-17 20:14:13 +01:00
Joas Schilling
ff8e0f5767
Merge pull request #4746 from nextcloud/enh/improve-system-processes
Use proc_open to run system commands in bridge manager
2020-12-16 10:08:08 +01:00
Joas Schilling
9a346a2d4b
Merge pull request #4653 from nextcloud/enh/noid/matterbridge-design
Improve Matterbridge settings design
2020-12-15 15:13:14 +01:00
Julien Veyssier
7ffd987e2a
fix bridge-related system messages and send one when bridge is toggled
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
2020-12-15 13:31:42 +01:00
Julien Veyssier
07650ec70f
use proc_open to run system commands in bridge manager
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
2020-12-11 15:49:42 +01:00
Julien Veyssier
5372c12a6a
refs #4719 all bridge services have a channel key
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
2020-12-11 12:11:49 +01:00
Julien Veyssier
f37f50c8e1
refs #4719 fix telegram channel config key
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
2020-12-09 12:15:02 +01:00
Julien Veyssier
ab16e92436
remove bridge bot from room when bridge is disabled
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
2020-11-27 10:55:07 +01:00
Joas Schilling
459858a695
Introduce constants for the actor types
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-26 09:46:43 +01:00
Joas Schilling
96668663ba
Only use addUsers and joinRoom from Participant service
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-30 10:38:49 +01:00
Julien Veyssier
4f2e7b1b73
use strict match to determine if bridge process is running
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
2020-10-16 10:59:52 +02:00
Julien Veyssier
da60254667
make isRunning work with busybox ps
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
2020-10-13 12:19:54 +02:00
Julien Veyssier
7cd30b6621
larger filter to get zombie processes
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
2020-10-13 12:12:36 +02:00
Julien Veyssier
974469ab63
use 'ps' syntax which works in busybox
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
2020-10-13 12:11:36 +02:00