diff --git a/lib/Travelynx/Command/database.pm b/lib/Travelynx/Command/database.pm index a0dea45a285f00264932e1976b2d6701f65c0d0c..022614bdb0de2b8768f2ac3d4064b0fe3e03145c 100644 --- a/lib/Travelynx/Command/database.pm +++ b/lib/Travelynx/Command/database.pm @@ -1761,6 +1761,25 @@ my @migrations = ( } ); }, + + # v42 -> v43 + # list sent and received follow requests + sub { + my ($db) = @_; + $db->query( + qq{ + alter view follow_requests rename to rx_follow_requests; + create view tx_follow_requests as select + relations.subject_id as self_id, + users.id as id, + users.name as name + from relations + join users on relations.object_id = users.id + where predicate = 2; + update schema_version set version = 43; + } + ); + }, ); # TODO add 'hafas' column to in_transit (and maybe journeys? undo/redo needs something to work with...) diff --git a/lib/Travelynx/Controller/Account.pm b/lib/Travelynx/Controller/Account.pm index d7035d8c7dc7de57ebb643379c0473d60e378cac..26643295247e396dc8a0e3bcada88f939b4d5a89 100644 --- a/lib/Travelynx/Controller/Account.pm +++ b/lib/Travelynx/Controller/Account.pm @@ -547,12 +547,24 @@ sub social_list { my $kind = $self->stash('kind'); my $user = $self->current_user; - if ( $kind eq 'follow-requests' ) { + if ( $kind eq 'follow-requests-received' ) { my @follow_reqs = $self->users->get_follow_requests( uid => $user->{id} ); $self->render( 'social_list', - type => 'follow-requests', + type => 'follow-requests-received', + entries => [@follow_reqs], + notifications => $user->{notifications}, + ); + } + elsif ( $kind eq 'follow-requests-sent' ) { + my @follow_reqs = $self->users->get_follow_requests( + uid => $user->{id}, + sent => 1 + ); + $self->render( + 'social_list', + type => 'follow-requests-sent', entries => [@follow_reqs], notifications => $user->{notifications}, ); @@ -994,10 +1006,10 @@ sub change_name { return; } - # The users table has a unique constraint on the "name" column, so having - # two users with the same name is not possible. The race condition - # between the user_name_exists check in is_name_invalid and this - # change_name call is harmless. + # The users table has a unique constraint on the "name" column, so having + # two users with the same name is not possible. The race condition + # between the user_name_exists check in is_name_invalid and this + # change_name call is harmless. my $success = $self->users->change_name( uid => $self->current_user->{id}, name => $new_name @@ -1240,20 +1252,25 @@ sub confirm_mail { } sub account { - my ($self) = @_; - my $uid = $self->current_user->{id}; - my $follow_requests = $self->users->has_follow_requests( uid => $uid ); - my $followers = $self->users->has_followers( uid => $uid ); - my $following = $self->users->has_followees( uid => $uid ); - my $blocked = $self->users->has_blocked_users( uid => $uid ); + my ($self) = @_; + my $uid = $self->current_user->{id}; + my $rx_follow_requests = $self->users->has_follow_requests( uid => $uid ); + my $tx_follow_requests = $self->users->has_follow_requests( + uid => $uid, + sent => 1 + ); + my $followers = $self->users->has_followers( uid => $uid ); + my $following = $self->users->has_followees( uid => $uid ); + my $blocked = $self->users->has_blocked_users( uid => $uid ); $self->render( 'account', - api_token => $self->users->get_api_token( uid => $uid ), - num_follow_requests => $follow_requests, - num_followers => $followers, - num_following => $following, - num_blocked => $blocked, + api_token => $self->users->get_api_token( uid => $uid ), + num_rx_follow_requests => $rx_follow_requests, + num_tx_follow_requests => $tx_follow_requests, + num_followers => $followers, + num_following => $following, + num_blocked => $blocked, ); $self->users->mark_seen( uid => $uid ); } diff --git a/lib/Travelynx/Model/Users.pm b/lib/Travelynx/Model/Users.pm index 8f1714d0408d78df0e6805056e4db53bcdcf75ee..0665f6a3e26e32fdac12587b351534bd3b9d8848 100644 --- a/lib/Travelynx/Model/Users.pm +++ b/lib/Travelynx/Model/Users.pm @@ -809,8 +809,8 @@ sub get_relation { } return; - #my $res_h = $db->select( 'relations', ['subject_id', 'predicate'], - # { subject_id => [$uid, $target], object_id => [$target, $target] } )->hash; + #my $res_h = $db->select( 'relations', ['subject_id', 'predicate'], + # { subject_id => [$uid, $target], object_id => [$target, $target] } )->hash; } sub update_notifications { @@ -1096,11 +1096,12 @@ sub has_followers { sub get_follow_requests { my ( $self, %opt ) = @_; - my $db = $opt{db} // $self->{pg}->db; - my $uid = $opt{uid}; + my $db = $opt{db} // $self->{pg}->db; + my $uid = $opt{uid}; + my $table = $opt{sent} ? 'tx_follow_requests' : 'rx_follow_requests'; my $res - = $db->select( 'follow_requests', [ 'id', 'name' ], { self_id => $uid } ); + = $db->select( $table, [ 'id', 'name' ], { self_id => $uid } ); return $res->hashes->each; } @@ -1108,11 +1109,12 @@ sub get_follow_requests { sub has_follow_requests { my ( $self, %opt ) = @_; - my $db = $opt{db} // $self->{pg}->db; - my $uid = $opt{uid}; + my $db = $opt{db} // $self->{pg}->db; + my $uid = $opt{uid}; + my $table = $opt{sent} ? 'tx_follow_requests' : 'rx_follow_requests'; - return $db->select( 'follow_requests', 'count(*) as count', - { self_id => $uid } )->hash->{count}; + return $db->select( $table, 'count(*) as count', { self_id => $uid } ) + ->hash->{count}; } sub get_followees { diff --git a/t/21-relations.t b/t/21-relations.t index 5b68555aac9a578f0c54a0d41f82a3687da7de22..0a33dc56953279e85d3de23a0a152ead6493c819 100644 --- a/t/21-relations.t +++ b/t/21-relations.t @@ -90,12 +90,40 @@ is( scalar $u->get_followees( uid => $uid1 ), 0 ); is( scalar $u->get_followees( uid => $uid2 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid1 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid2 ), 0 ); -is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); -is( scalar $u->get_blocked_users( uid => $uid2 ), 0 ); -is( $u->has_follow_requests( uid => $uid1 ), 0 ); -is( $u->has_follow_requests( uid => $uid2 ), 0 ); -is( $u->get( uid => $uid1 )->{notifications}, 0 ); -is( $u->get( uid => $uid2 )->{notifications}, 0 ); +is( + scalar $u->get_follow_requests( + uid => $uid1, + sent => 1 + ), + 0 +); +is( + scalar $u->get_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); +is( scalar $u->get_blocked_users( uid => $uid2 ), 0 ); +is( $u->has_follow_requests( uid => $uid1 ), 0 ); +is( $u->has_follow_requests( uid => $uid2 ), 0 ); +is( + $u->has_follow_requests( + uid => $uid1, + sent => 1 + ), + 0 +); +is( + $u->has_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( $u->get( uid => $uid1 )->{notifications}, 0 ); +is( $u->get( uid => $uid2 )->{notifications}, 0 ); $u->request_follow( uid => $uid1, @@ -122,16 +150,48 @@ is( scalar $u->get_followees( uid => $uid1 ), 0 ); is( scalar $u->get_followees( uid => $uid2 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid1 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid2 ), 1 ); -is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); -is( scalar $u->get_blocked_users( uid => $uid2 ), 0 ); -is( $u->has_follow_requests( uid => $uid1 ), 0 ); -is( $u->has_follow_requests( uid => $uid2 ), 1 ); -is( $u->get( uid => $uid1 )->{notifications}, 0 ); -is( $u->get( uid => $uid2 )->{notifications}, 1 ); +is( + scalar $u->get_follow_requests( + uid => $uid1, + sent => 1 + ), + 1 +); +is( + scalar $u->get_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); +is( scalar $u->get_blocked_users( uid => $uid2 ), 0 ); +is( $u->has_follow_requests( uid => $uid1 ), 0 ); +is( $u->has_follow_requests( uid => $uid2 ), 1 ); +is( + $u->has_follow_requests( + uid => $uid1, + sent => 1 + ), + 1 +); +is( + $u->has_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( $u->get( uid => $uid1 )->{notifications}, 0 ); +is( $u->get( uid => $uid2 )->{notifications}, 1 ); is_deeply( [ $u->get_follow_requests( uid => $uid2 ) ], [ { id => $uid1, name => 'test1' } ] ); +is_deeply( + [ $u->get_follow_requests( uid => $uid1, sent => 1 ) ], + [ { id => $uid2, name => 'test2' } ] +); $u->reject_follow_request( uid => $uid2, @@ -158,10 +218,24 @@ is( scalar $u->get_followees( uid => $uid1 ), 0 ); is( scalar $u->get_followees( uid => $uid2 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid1 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid2 ), 0 ); -is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); -is( scalar $u->get_blocked_users( uid => $uid2 ), 0 ); -is( $u->get( uid => $uid1 )->{notifications}, 0 ); -is( $u->get( uid => $uid2 )->{notifications}, 0 ); +is( + scalar $u->get_follow_requests( + uid => $uid1, + sent => 1 + ), + 0 +); +is( + scalar $u->get_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); +is( scalar $u->get_blocked_users( uid => $uid2 ), 0 ); +is( $u->get( uid => $uid1 )->{notifications}, 0 ); +is( $u->get( uid => $uid2 )->{notifications}, 0 ); $u->request_follow( uid => $uid1, @@ -188,16 +262,48 @@ is( scalar $u->get_followees( uid => $uid1 ), 0 ); is( scalar $u->get_followees( uid => $uid2 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid1 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid2 ), 1 ); -is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); -is( scalar $u->get_blocked_users( uid => $uid2 ), 0 ); -is( $u->has_follow_requests( uid => $uid1 ), 0 ); -is( $u->has_follow_requests( uid => $uid2 ), 1 ); -is( $u->get( uid => $uid1 )->{notifications}, 0 ); -is( $u->get( uid => $uid2 )->{notifications}, 1 ); +is( + scalar $u->get_follow_requests( + uid => $uid1, + sent => 1 + ), + 1 +); +is( + scalar $u->get_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); +is( scalar $u->get_blocked_users( uid => $uid2 ), 0 ); +is( $u->has_follow_requests( uid => $uid1 ), 0 ); +is( $u->has_follow_requests( uid => $uid2 ), 1 ); +is( + $u->has_follow_requests( + uid => $uid1, + sent => 1 + ), + 1 +); +is( + $u->has_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( $u->get( uid => $uid1 )->{notifications}, 0 ); +is( $u->get( uid => $uid2 )->{notifications}, 1 ); is_deeply( [ $u->get_follow_requests( uid => $uid2 ) ], [ { id => $uid1, name => 'test1' } ] ); +is_deeply( + [ $u->get_follow_requests( uid => $uid1, sent => 1 ) ], + [ { id => $uid2, name => 'test2' } ] +); $u->accept_follow_request( uid => $uid2, @@ -224,12 +330,40 @@ is( scalar $u->get_followees( uid => $uid1 ), 1 ); is( scalar $u->get_followees( uid => $uid2 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid1 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid2 ), 0 ); -is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); -is( scalar $u->get_blocked_users( uid => $uid2 ), 0 ); -is( $u->has_follow_requests( uid => $uid1 ), 0 ); -is( $u->has_follow_requests( uid => $uid2 ), 0 ); -is( $u->get( uid => $uid1 )->{notifications}, 0 ); -is( $u->get( uid => $uid2 )->{notifications}, 0 ); +is( + scalar $u->get_follow_requests( + uid => $uid1, + sent => 1 + ), + 0 +); +is( + scalar $u->get_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); +is( scalar $u->get_blocked_users( uid => $uid2 ), 0 ); +is( $u->has_follow_requests( uid => $uid1 ), 0 ); +is( $u->has_follow_requests( uid => $uid2 ), 0 ); +is( + $u->has_follow_requests( + uid => $uid1, + sent => 1 + ), + 0 +); +is( + $u->has_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( $u->get( uid => $uid1 )->{notifications}, 0 ); +is( $u->get( uid => $uid2 )->{notifications}, 0 ); is_deeply( [ $u->get_followers( uid => $uid2 ) ], [ @@ -273,12 +407,40 @@ is( scalar $u->get_followees( uid => $uid1 ), 0 ); is( scalar $u->get_followees( uid => $uid2 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid1 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid2 ), 0 ); -is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); -is( scalar $u->get_blocked_users( uid => $uid2 ), 0 ); -is( $u->has_follow_requests( uid => $uid1 ), 0 ); -is( $u->has_follow_requests( uid => $uid2 ), 0 ); -is( $u->get( uid => $uid1 )->{notifications}, 0 ); -is( $u->get( uid => $uid2 )->{notifications}, 0 ); +is( + scalar $u->get_follow_requests( + uid => $uid1, + sent => 1 + ), + 0 +); +is( + scalar $u->get_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); +is( scalar $u->get_blocked_users( uid => $uid2 ), 0 ); +is( $u->has_follow_requests( uid => $uid1 ), 0 ); +is( $u->has_follow_requests( uid => $uid2 ), 0 ); +is( + $u->has_follow_requests( + uid => $uid1, + sent => 1 + ), + 0 +); +is( + $u->has_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( $u->get( uid => $uid1 )->{notifications}, 0 ); +is( $u->get( uid => $uid2 )->{notifications}, 0 ); $u->request_follow( uid => $uid1, @@ -325,12 +487,40 @@ is( scalar $u->get_followees( uid => $uid1 ), 0 ); is( scalar $u->get_followees( uid => $uid2 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid1 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid2 ), 0 ); -is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); -is( scalar $u->get_blocked_users( uid => $uid2 ), 1 ); -is( $u->has_follow_requests( uid => $uid1 ), 0 ); -is( $u->has_follow_requests( uid => $uid2 ), 0 ); -is( $u->get( uid => $uid1 )->{notifications}, 0 ); -is( $u->get( uid => $uid2 )->{notifications}, 0 ); +is( + scalar $u->get_follow_requests( + uid => $uid1, + sent => 1 + ), + 0 +); +is( + scalar $u->get_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); +is( scalar $u->get_blocked_users( uid => $uid2 ), 1 ); +is( $u->has_follow_requests( uid => $uid1 ), 0 ); +is( $u->has_follow_requests( uid => $uid2 ), 0 ); +is( + $u->has_follow_requests( + uid => $uid1, + sent => 1 + ), + 0 +); +is( + $u->has_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( $u->get( uid => $uid1 )->{notifications}, 0 ); +is( $u->get( uid => $uid2 )->{notifications}, 0 ); is_deeply( [ $u->get_blocked_users( uid => $uid2 ) ], [ { id => $uid1, name => 'test1' } ] @@ -361,12 +551,40 @@ is( scalar $u->get_followees( uid => $uid1 ), 0 ); is( scalar $u->get_followees( uid => $uid2 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid1 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid2 ), 0 ); -is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); -is( scalar $u->get_blocked_users( uid => $uid2 ), 0 ); -is( $u->has_follow_requests( uid => $uid1 ), 0 ); -is( $u->has_follow_requests( uid => $uid2 ), 0 ); -is( $u->get( uid => $uid1 )->{notifications}, 0 ); -is( $u->get( uid => $uid2 )->{notifications}, 0 ); +is( + scalar $u->get_follow_requests( + uid => $uid1, + sent => 1 + ), + 0 +); +is( + scalar $u->get_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); +is( scalar $u->get_blocked_users( uid => $uid2 ), 0 ); +is( $u->has_follow_requests( uid => $uid1 ), 0 ); +is( $u->has_follow_requests( uid => $uid2 ), 0 ); +is( + $u->has_follow_requests( + uid => $uid1, + sent => 1 + ), + 0 +); +is( + $u->has_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( $u->get( uid => $uid1 )->{notifications}, 0 ); +is( $u->get( uid => $uid2 )->{notifications}, 0 ); $u->block( uid => $uid2, @@ -393,12 +611,40 @@ is( scalar $u->get_followees( uid => $uid1 ), 0 ); is( scalar $u->get_followees( uid => $uid2 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid1 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid2 ), 0 ); -is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); -is( scalar $u->get_blocked_users( uid => $uid2 ), 1 ); -is( $u->has_follow_requests( uid => $uid1 ), 0 ); -is( $u->has_follow_requests( uid => $uid2 ), 0 ); -is( $u->get( uid => $uid1 )->{notifications}, 0 ); -is( $u->get( uid => $uid2 )->{notifications}, 0 ); +is( + scalar $u->get_follow_requests( + uid => $uid1, + sent => 1 + ), + 0 +); +is( + scalar $u->get_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); +is( scalar $u->get_blocked_users( uid => $uid2 ), 1 ); +is( $u->has_follow_requests( uid => $uid1 ), 0 ); +is( $u->has_follow_requests( uid => $uid2 ), 0 ); +is( + $u->has_follow_requests( + uid => $uid1, + sent => 1 + ), + 0 +); +is( + $u->has_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( $u->get( uid => $uid1 )->{notifications}, 0 ); +is( $u->get( uid => $uid2 )->{notifications}, 0 ); is_deeply( [ $u->get_blocked_users( uid => $uid2 ) ], [ { id => $uid1, name => 'test1' } ] @@ -429,12 +675,40 @@ is( scalar $u->get_followees( uid => $uid1 ), 0 ); is( scalar $u->get_followees( uid => $uid2 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid1 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid2 ), 0 ); -is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); -is( scalar $u->get_blocked_users( uid => $uid2 ), 0 ); -is( $u->has_follow_requests( uid => $uid1 ), 0 ); -is( $u->has_follow_requests( uid => $uid2 ), 0 ); -is( $u->get( uid => $uid1 )->{notifications}, 0 ); -is( $u->get( uid => $uid2 )->{notifications}, 0 ); +is( + scalar $u->get_follow_requests( + uid => $uid1, + sent => 1 + ), + 0 +); +is( + scalar $u->get_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); +is( scalar $u->get_blocked_users( uid => $uid2 ), 0 ); +is( $u->has_follow_requests( uid => $uid1 ), 0 ); +is( $u->has_follow_requests( uid => $uid2 ), 0 ); +is( + $u->has_follow_requests( + uid => $uid1, + sent => 1 + ), + 0 +); +is( + $u->has_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( $u->get( uid => $uid1 )->{notifications}, 0 ); +is( $u->get( uid => $uid2 )->{notifications}, 0 ); $u->request_follow( uid => $uid1, @@ -465,12 +739,40 @@ is( scalar $u->get_followees( uid => $uid1 ), 1 ); is( scalar $u->get_followees( uid => $uid2 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid1 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid2 ), 0 ); -is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); -is( scalar $u->get_blocked_users( uid => $uid2 ), 0 ); -is( $u->has_follow_requests( uid => $uid1 ), 0 ); -is( $u->has_follow_requests( uid => $uid2 ), 0 ); -is( $u->get( uid => $uid1 )->{notifications}, 0 ); -is( $u->get( uid => $uid2 )->{notifications}, 0 ); +is( + scalar $u->get_follow_requests( + uid => $uid1, + sent => 1 + ), + 0 +); +is( + scalar $u->get_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); +is( scalar $u->get_blocked_users( uid => $uid2 ), 0 ); +is( $u->has_follow_requests( uid => $uid1 ), 0 ); +is( $u->has_follow_requests( uid => $uid2 ), 0 ); +is( + $u->has_follow_requests( + uid => $uid1, + sent => 1 + ), + 0 +); +is( + $u->has_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( $u->get( uid => $uid1 )->{notifications}, 0 ); +is( $u->get( uid => $uid2 )->{notifications}, 0 ); is_deeply( [ $u->get_followers( uid => $uid2 ) ], [ @@ -514,12 +816,40 @@ is( scalar $u->get_followees( uid => $uid1 ), 0 ); is( scalar $u->get_followees( uid => $uid2 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid1 ), 0 ); is( scalar $u->get_follow_requests( uid => $uid2 ), 0 ); -is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); -is( scalar $u->get_blocked_users( uid => $uid2 ), 0 ); -is( $u->has_follow_requests( uid => $uid1 ), 0 ); -is( $u->has_follow_requests( uid => $uid2 ), 0 ); -is( $u->get( uid => $uid1 )->{notifications}, 0 ); -is( $u->get( uid => $uid2 )->{notifications}, 0 ); +is( + scalar $u->get_follow_requests( + uid => $uid1, + sent => 1 + ), + 0 +); +is( + scalar $u->get_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( scalar $u->get_blocked_users( uid => $uid1 ), 0 ); +is( scalar $u->get_blocked_users( uid => $uid2 ), 0 ); +is( $u->has_follow_requests( uid => $uid1 ), 0 ); +is( $u->has_follow_requests( uid => $uid2 ), 0 ); +is( + $u->has_follow_requests( + uid => $uid1, + sent => 1 + ), + 0 +); +is( + $u->has_follow_requests( + uid => $uid2, + sent => 1 + ), + 0 +); +is( $u->get( uid => $uid1 )->{notifications}, 0 ); +is( $u->get( uid => $uid2 )->{notifications}, 0 ); $t->app->pg->db->query('drop schema travelynx_test_21 cascade'); done_testing(); diff --git a/templates/account.html.ep b/templates/account.html.ep index d3305a2700c68d05cbf42da4e10dae8f19af0d84..1da49be3c129bbefb890873b3f86d355065187b0 100644 --- a/templates/account.html.ep +++ b/templates/account.html.ep @@ -92,10 +92,10 @@ % } % elsif ($acc->{accept_follow_requests}) { Accounts können dir auf Anfrage folgen - % if ($num_follow_requests == 1) { + % if ($num_rx_follow_requests == 1) { – eine offene Anfrage - % } elsif ($num_follow_requests) { - – <%= $num_follow_requests %> offene Anfragen + % } elsif ($num_rx_follow_requests) { + – <%= $num_rx_follow_requests %> offene Anfragen % } % } @@ -179,7 +179,7 @@ -% if ($num_follow_requests or $num_followers or $num_following or $num_blocked) { +% if ($num_rx_follow_requests or $num_tx_follow_requests or $num_followers or $num_following or $num_blocked) {