add: use RemoteAddr for ip blocks as well
This commit is contained in:
parent
14936b8b90
commit
f5faed7762
12 changed files with 127 additions and 28 deletions
|
@ -352,7 +352,10 @@ macro_rules! ignore_users_gen {
|
|||
($user:ident, $data:ident) => {
|
||||
if let Some(ref ua) = $user {
|
||||
[
|
||||
$data.0.get_userblocks_receivers(ua.id).await,
|
||||
$data
|
||||
.0
|
||||
.get_userblocks_receivers(ua.id, &ua.associated)
|
||||
.await,
|
||||
$data.0.get_userblocks_initiator_by_receivers(ua.id).await,
|
||||
$data.0.get_user_stack_blocked_users(ua.id).await,
|
||||
]
|
||||
|
@ -364,7 +367,10 @@ macro_rules! ignore_users_gen {
|
|||
|
||||
($user:ident!, $data:ident) => {{
|
||||
[
|
||||
$data.0.get_userblocks_receivers($user.id).await,
|
||||
$data
|
||||
.0
|
||||
.get_userblocks_receivers($user.id, &$user.associated)
|
||||
.await,
|
||||
$data
|
||||
.0
|
||||
.get_userblocks_initiator_by_receivers($user.id)
|
||||
|
@ -376,7 +382,9 @@ macro_rules! ignore_users_gen {
|
|||
|
||||
($user:ident!, #$data:ident) => {
|
||||
[
|
||||
$data.get_userblocks_receivers($user.id).await,
|
||||
$data
|
||||
.get_userblocks_receivers($user.id, &$user.associated)
|
||||
.await,
|
||||
$data.get_userblocks_initiator_by_receivers($user.id).await,
|
||||
]
|
||||
.concat()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue