github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-20 22:00:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

suspend anonymously (#39)

Browse Source 
* suspend anonymously

closes https://github.com/flarum/core/issues/2614

* format less file

* empty methods should return null
This commit is contained in:
Hasan Özbey 2021-07-18 23:47:34 +03:00 committed by GitHub
parent 14c6675e47
commit 8353f087e5
8 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/suspend/js/src/forum/components/UserSuspendedNotification.js
View File

@ -15,7 +15,6 @@ export default class UserSuspendedNotification extends Notification {
const timeReadable = dayjs(suspendedUntil).from(notification.createdAt(), true);
return app.translator.trans('flarum-suspend.forum.notifications.user_suspended_text', {
user: notification.fromUser(),
timeReadable,
});
}

4
extensions/suspend/js/src/forum/components/UserUnsuspendedNotification.js
View File

@ -12,8 +12,6 @@ export default class UserUnsuspendedNotification extends Notification {
content() {
const notification = this.attrs.notification;
return app.translator.trans('flarum-suspend.forum.notifications.user_unsuspended_text', {
user: notification.fromUser(),
});
return app.translator.trans('flarum-suspend.forum.notifications.user_unsuspended_text');
}
}

6
extensions/suspend/less/forum.less
View File

@ -10,3 +10,9 @@
margin-right: 5px;
}
}
.Notification--userSuspended,
.Notification--userUnsuspended {
> .Avatar {
display: none;
}
}

4
extensions/suspend/locale/en.yml
View File

@ -15,8 +15,8 @@ flarum-suspend:
forum:
# These translations are used in the suspension notifications
notifications:
user_suspended_text: "{username} suspended you for {timeReadable}"
user_unsuspended_text: "{username} unsuspended you"
user_suspended_text: "You have been suspended for {timeReadable}"
user_unsuspended_text: You have been unsuspended
# These translations are used in the Suspend User modal dialog (admin function).
suspend_user:

2
extensions/suspend/src/Listener/SendNotificationWhenUserIsSuspended.php
View File

@ -31,7 +31,7 @@ class SendNotificationWhenUserIsSuspended
public function handle(Suspended $event)
{
$this->notifications->sync(
new UserSuspendedBlueprint($event->user, $event->actor),
new UserSuspendedBlueprint($event->user),
[$event->user]
);
}

2
extensions/suspend/src/Listener/SendNotificationWhenUserIsUnsuspended.php
View File

@ -31,7 +31,7 @@ class SendNotificationWhenUserIsUnsuspended
public function handle(Unsuspended $event)
{
$this->notifications->sync(
new UserUnsuspendedBlueprint($event->user, $event->actor),
new UserUnsuspendedBlueprint($event->user),
[$event->user]
);
}

11
extensions/suspend/src/Notification/UserSuspendedBlueprint.php
View File

@ -19,19 +19,12 @@ class UserSuspendedBlueprint implements BlueprintInterface
*/
public $user;
/**
* @var User
*/
public $actor;
/**
* @param User $user
* @param User $actor
*/
public function __construct(User $user, User $actor)
public function __construct(User $user)
{
$this->user = $user;
$this->actor = $actor;
}
/**
@ -47,7 +40,7 @@ class UserSuspendedBlueprint implements BlueprintInterface
*/
public function getFromUser()
{
return $this->actor;
return null;
}
/**

12
extensions/suspend/src/Notification/UserUnsuspendedBlueprint.php
View File

@ -19,19 +19,12 @@ class UserUnsuspendedBlueprint implements BlueprintInterface
*/
public $user;
/**
* @var User
*/
public $actor;
/**
* @param User $user
* @param User $actor
*/
public function __construct(User $user, User $actor)
public function __construct(User $user)
{
$this->user = $user;
$this->actor = $actor;
}
/**
@ -47,7 +40,7 @@ class UserUnsuspendedBlueprint implements BlueprintInterface
*/
public function getFromUser()
{
return $this->actor;
return null;
}
/**
@ -55,6 +48,7 @@ class UserUnsuspendedBlueprint implements BlueprintInterface
*/
public function getData()
{
return null;
}
/**