diff --git a/composer.json b/composer.json index f9ab9ab..c075b8c 100755 --- a/composer.json +++ b/composer.json @@ -46,7 +46,7 @@ }, "optional-dependencies": [ "fof/user-directory", - "blomstra/gdpr" + "flarum/gdpr" ] }, "flagrow": { @@ -64,7 +64,7 @@ "flarum/testing": "*", "flarum/approval": "*", "fof/user-directory": "*", - "blomstra/gdpr": "@beta" + "flarum/gdpr": "dev-main" }, "autoload-dev": { "psr-4": { diff --git a/extend.php b/extend.php index 7905915..255b628 100755 --- a/extend.php +++ b/extend.php @@ -12,7 +12,6 @@ namespace IanM\FollowUsers; -use Blomstra\Gdpr\Extend\UserData; use Flarum\Api\Controller\ListUsersController; use Flarum\Api\Controller\ShowForumController; use Flarum\Api\Controller\ShowUserController; @@ -23,6 +22,7 @@ use Flarum\Discussion\Event as DiscussionEvent; use Flarum\Discussion\Filter\DiscussionFilterer; use Flarum\Extend; +use Flarum\Gdpr\Extend\UserData; use Flarum\Http\RequestUtil; use Flarum\User\Event\Saving; use Flarum\User\Filter\UserFilterer; @@ -106,7 +106,7 @@ ->serializeToForum('ianm-follow-users.stats-on-profile', 'ianm-follow-users.stats-on-profile', 'boolVal'), (new Extend\Conditional()) - ->whenExtensionEnabled('blomstra-gdpr', fn () => [ + ->whenExtensionEnabled('flarum-gdpr', fn () => [ (new UserData()) ->addType(Data\FollowUser::class), ]), diff --git a/resources/locale/en.yml b/resources/locale/en.yml index 1ba1dad..d62bedf 100644 --- a/resources/locale/en.yml +++ b/resources/locale/en.yml @@ -1,4 +1,4 @@ -blomstra-gdpr: +flarum-gdpr: lib: data: followuser: diff --git a/src/Data/FollowUser.php b/src/Data/FollowUser.php index 6a7a394..dfc5527 100644 --- a/src/Data/FollowUser.php +++ b/src/Data/FollowUser.php @@ -12,7 +12,7 @@ namespace IanM\FollowUsers\Data; -use Blomstra\Gdpr\Data\Type; +use Flarum\Gdpr\Data\Type; use IanM\FollowUsers\FollowState; use Illuminate\Support\Arr;