Skip to content

Commit

Permalink
chore: rebasing conflicts
Browse files Browse the repository at this point in the history
Signed-off-by: Sami Mazouz <sychocouldy@gmail.com>
  • Loading branch information
SychO9 committed Nov 20, 2022
1 parent 33c8af2 commit 75a9e0e
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion extensions/akismet/extend.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@
->register(AkismetProvider::class),

(new Extend\Model(Post::class))
->castAttribute('is_spam', 'bool'),
->cast('is_spam', 'bool'),
];
4 changes: 2 additions & 2 deletions extensions/approval/extend.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
// Discussions should be approved by default
(new Extend\Model(Discussion::class))
->default('is_approved', true)
->castAttribute('is_approved', 'bool'),
->cast('is_approved', 'bool'),

// Posts should be approved by default
(new Extend\Model(Post::class))
->default('is_approved', true)
->castAttribute('is_approved', 'bool'),
->cast('is_approved', 'bool'),

(new Extend\ApiSerializer(BasicDiscussionSerializer::class))
->attribute('isApproved', function ($serializer, Discussion $discussion) {
Expand Down
2 changes: 1 addition & 1 deletion extensions/flags/extend.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
->delete('/posts/{id}/flags', 'flags.delete', DeleteFlagsController::class),

(new Extend\Model(User::class))
->castAttribute('read_flags_at', 'datetime'),
->cast('read_flags_at', 'datetime'),

(new Extend\Model(Post::class))
->hasMany('flags', Flag::class, 'post_id'),
Expand Down
2 changes: 1 addition & 1 deletion extensions/lock/extend.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
->type(DiscussionLockedBlueprint::class, BasicDiscussionSerializer::class, ['alert']),

(new Extend\Model(Discussion::class))
->castAttribute('is_locked', 'bool'),
->cast('is_locked', 'bool'),

(new Extend\ApiSerializer(DiscussionSerializer::class))
->attribute('isLocked', function (DiscussionSerializer $serializer, Discussion $discussion) {
Expand Down
2 changes: 1 addition & 1 deletion extensions/nicknames/extend.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
new Extend\Locales(__DIR__.'/locale'),

(new Extend\Model(User::class))
->castAttribute('nickname', 'string'),
->cast('nickname', 'string'),

(new Extend\User())
->displayNameDriver('nickname', NicknameDriver::class),
Expand Down
2 changes: 1 addition & 1 deletion extensions/sticky/extend.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
->css(__DIR__.'/less/forum.less'),

(new Extend\Model(Discussion::class))
->castAttribute('is_sticky', 'bool'),
->cast('is_sticky', 'bool'),

(new Extend\Post())
->type(DiscussionStickiedPost::class),
Expand Down
4 changes: 2 additions & 2 deletions extensions/subscriptions/extend.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
new Extend\Locales(__DIR__.'/locale'),

(new Extend\Model(User::class))
->castAttribute('last_read_post_number', 'integer'),
->cast('last_read_post_number', 'integer'),

(new Extend\Model(UserState::class))
->castAttribute('subscription', 'string'),
->cast('subscription', 'string'),

(new Extend\View)
->namespace('flarum-subscriptions', __DIR__.'/views'),
Expand Down
6 changes: 3 additions & 3 deletions extensions/suspend/extend.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
->css(__DIR__.'/less/admin.less'),

(new Extend\Model(User::class))
->castAttribute('suspended_until', 'datetime')
->castAttribute('suspend_reason', 'string')
->castAttribute('suspend_message', 'string'),
->cast('suspended_until', 'datetime')
->cast('suspend_reason', 'string')
->cast('suspend_message', 'string'),

(new Extend\ApiSerializer(UserSerializer::class))
->attributes(AddUserSuspendAttributes::class),
Expand Down

0 comments on commit 75a9e0e

Please sign in to comment.