Skip to content

fix: Trigger both OCA and OCP ContentProviderRegisterEvent #187

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.

Sign up for GitHub

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
marcelklehr merged 2 commits into from
Dec 4, 2025
Merged

fix: Trigger both OCA and OCP ContentProviderRegisterEvent #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7b757d
fix: Trigger both OCA and OCP ContentProviderRegisterEvent
marcelklehr Oct 22, 2025
6eea508
fix: MetadataService#getIdFromSource: Fix regex
marcelklehr Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/Public/ContentManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
use OCA\ContextChat\BackgroundJobs\SubmitContentJob;
use OCA\ContextChat\Db\QueueContentItem;
use OCA\ContextChat\Db\QueueContentItemMapper;
use OCA\ContextChat\Event\ContentProviderRegisterEvent;
use OCA\ContextChat\Logger;
use OCA\ContextChat\Service\ActionScheduler;
use OCA\ContextChat\Service\ProviderConfigService;
Expand Down Expand Up @@ -91,7 +90,9 @@ public function registerContentProvider(string $appId, string $providerId, strin
* @since 2.2.2
*/
public function collectAllContentProviders(): void {
$providerCollectionEvent = new ContentProviderRegisterEvent($this);
$providerCollectionEvent = new \OCA\ContextChat\Event\ContentProviderRegisterEvent($this);
$this->eventDispatcher->dispatchTyped($providerCollectionEvent);
$providerCollectionEvent = new \OCP\ContextChat\Events\ContentProviderRegisterEvent($this);
$this->eventDispatcher->dispatchTyped($providerCollectionEvent);
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Service/MetadataService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public function getEnrichedProviders(): array {

private function getIdFromSource(string $sourceId): string {
// note the ":" in the item id part
if (!preg_match('/^[a-zA-Z0-9_-]+__[a-zA-Z0-9_-]+: ([a-zA-Z0-9:-])+$/', $sourceId, $matches)) {
if (!preg_match('/^[a-zA-Z0-9_-]+__[a-zA-Z0-9_-]+: ([a-zA-Z0-9:-]+)$/', $sourceId, $matches)) {
throw new \InvalidArgumentException("Invalid source id $sourceId");
}
return $matches[1];
Expand Down
Loading