Skip to content

Commit f6861f9

Browse files
zorkianzorkian
committed
Tidy
1 parent 6ac6450 commit f6861f9

File tree

4 files changed

+96
-80
lines changed

4 files changed

+96
-80
lines changed

‎cgi-bin/DW/Hooks/EmbedWhitelist.pm

+4-4
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ my %host_path_match = (
7878
"www.flickr.com" => [ qr!/player/$!, 1 ],
7979
"www.funnyordie.com" => [ qr!/embed/!, 1 ],
8080

81-
"embed.gettyimages.com" => [ qr!/iframe/!, 1 ],
82-
"getyarn.io" => [ qr!^/yarn-clip/embed/[0-9a-fA-F\-]{36}!, 1 ],
83-
"www.goodreads.com" => [ qr!^/widgets/!, 1 ],
84-
"giphy.com" => [ qr!^/embed/\w+!, 1 ],
81+
"embed.gettyimages.com" => [ qr!/iframe/!, 1 ],
82+
"getyarn.io" => [ qr!^/yarn-clip/embed/[0-9a-fA-F\-]{36}!, 1 ],
83+
"www.goodreads.com" => [ qr!^/widgets/!, 1 ],
84+
"giphy.com" => [ qr!^/embed/\w+!, 1 ],
8585

8686
"maps.google.com" => [ qr!^/maps!, 1 ],
8787
"www.google.com" => [ qr!^/(calendar/|maps/embed)!, 1 ],

‎cgi-bin/LJ/Tags.pm

+11-7
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ sub get_permission_levels {
654654
# </LJFUNC>
655655
sub canonical_tag {
656656
my $tag = shift;
657-
$tag =~ s/\s+/ /g; # condense multiple spaces to a single space
657+
$tag =~ s/\s+/ /g; # condense multiple spaces to a single space
658658
$tag = LJ::text_trim( $tag, LJ::BMAX_KEYWORD, LJ::CMAX_KEYWORD );
659659
$tag = LJ::utf8_lc($tag);
660660
return $tag;
@@ -700,7 +700,7 @@ sub is_valid_tagstring {
700700
foreach my $tag (@list) {
701701

702702
# canonicalize and determine validity
703-
$tag = LJ::Tags::canonical_tag( $tag );
703+
$tag = LJ::Tags::canonical_tag($tag);
704704
return 0 unless $valid_tag->($tag);
705705

706706
# now push on our list
@@ -1354,11 +1354,15 @@ sub rename_usertag {
13541354
) unless $newkw eq $newname; # Far from ideal UX-wise.
13551355

13561356
# validate tag length (in bytes)
1357-
return $err->( LJ::Lang::ml( 'taglib.error.toolong', {
1358-
beforetag => LJ::ehtml($newkw),
1359-
aftertag => LJ::ehtml($newname)
1360-
} ) )
1361-
unless length LJ::Tags::canonical_tag( $newkw ) <= LJ::BMAX_KEYWORD;
1357+
return $err->(
1358+
LJ::Lang::ml(
1359+
'taglib.error.toolong',
1360+
{
1361+
beforetag => LJ::ehtml($newkw),
1362+
aftertag => LJ::ehtml($newname)
1363+
}
1364+
)
1365+
) unless length LJ::Tags::canonical_tag($newkw) <= LJ::BMAX_KEYWORD;
13621366

13631367
# get a list of keyword ids to operate on
13641368
my $kwid;

‎cgi-bin/LJ/User/Message.pm

+9-4
Original file line numberDiff line numberDiff line change
@@ -309,11 +309,16 @@ sub can_receive_message {
309309

310310
my $u_age = $u->init_age;
311311
my $s_age = $sender->init_age;
312+
312313
# init_age returns undef for init_bdate year 0000.
313-
return 0 if defined($u_age) && $u_age < 18
314-
&& (!defined($s_age) || $s_age >= 18);
315-
return 0 if (!defined($u_age) || $u_age >= 18)
316-
&& defined($s_age) && $s_age < 18;
314+
return 0
315+
if defined($u_age)
316+
&& $u_age < 18
317+
&& ( !defined($s_age) || $s_age >= 18 );
318+
return 0
319+
if ( !defined($u_age) || $u_age >= 18 )
320+
&& defined($s_age)
321+
&& $s_age < 18;
317322

318323
return 1;
319324
}

‎t/pm-age-barrier.t

+72-65
Original file line numberDiff line numberDiff line change
@@ -23,98 +23,105 @@ use LJ::Test qw(temp_user);
2323
use LJ::User;
2424

2525
# Will hold temp user objects
26-
my ($nineteen_today, $eighteen_yesterday, $eighteen_today,
27-
$eighteen_in_1_to_4_days, $seventeen_today, $age_unknown);
26+
my (
27+
$nineteen_today, $eighteen_yesterday, $eighteen_today,
28+
$eighteen_in_1_to_4_days, $seventeen_today, $age_unknown
29+
);
2830

2931
# Test users and their ages
30-
my @users = ( # \$user_obj, $years_old, $months_old, $days_old
31-
[\$nineteen_today, 19, 0, 0],
32-
[\$eighteen_yesterday, 18, 0, 1],
33-
[\$eighteen_today, 18, 0, 0],
34-
[\$eighteen_in_1_to_4_days, 17, 11, 28], # 29..31 may get them to or past 18yo.
35-
[\$seventeen_today, 17, 0, 0],
36-
[\$age_unknown] # Will use 0000-00-00 as init_bdate.
32+
my @users = ( # \$user_obj, $years_old, $months_old, $days_old
33+
[ \$nineteen_today, 19, 0, 0 ],
34+
[ \$eighteen_yesterday, 18, 0, 1 ],
35+
[ \$eighteen_today, 18, 0, 0 ],
36+
[ \$eighteen_in_1_to_4_days, 17, 11, 28 ], # 29..31 may get them to or past 18yo.
37+
[ \$seventeen_today, 17, 0, 0 ],
38+
[ \$age_unknown ] # Will use 0000-00-00 as init_bdate.
3739
);
3840

3941
# Called as create_users(time(), @users)
4042
sub create_users {
4143
my $time = shift;
4244

4345
foreach my $user (@_) {
44-
my ($user_obj_ref, $years_old, $months_old, $days_old) = @$user;
46+
my ( $user_obj_ref, $years_old, $months_old, $days_old ) = @$user;
47+
48+
$$user_obj_ref = temp_user();
4549

46-
$$user_obj_ref = temp_user();
47-
48-
if (defined($years_old) && defined($months_old) && defined($days_old)) {
49-
$$user_obj_ref->set_prop("init_bdate", DateTime->from_epoch(epoch => $time)
50-
->subtract(years => $years_old,
51-
months => $months_old,
52-
days => $days_old)
53-
->ymd);
54-
} else {
55-
$$user_obj_ref->set_prop("init_bdate", "0000-00-00");
56-
}
50+
if ( defined($years_old) && defined($months_old) && defined($days_old) ) {
51+
$$user_obj_ref->set_prop(
52+
"init_bdate",
53+
DateTime->from_epoch( epoch => $time )->subtract(
54+
years => $years_old,
55+
months => $months_old,
56+
days => $days_old
57+
)->ymd
58+
);
59+
}
60+
else {
61+
$$user_obj_ref->set_prop( "init_bdate", "0000-00-00" );
62+
}
5763

58-
$$user_obj_ref->set_prop("opt_usermsg", "Y");
64+
$$user_obj_ref->set_prop( "opt_usermsg", "Y" );
5965
}
6066
}
6167

6268
my $time = time();
63-
my ($h, $m) = (gmtime($time))[2, 1];
64-
if (($h == 23) && ($m == 59)) { # Assumes tests will take under 1 minute.
65-
plan skip_all => "Avoiding possible race condition at 23:59 UTC. Please rerun the test.";
66-
} else {
67-
create_users($time, @users);
69+
my ( $h, $m ) = ( gmtime($time) )[ 2, 1 ];
70+
if ( ( $h == 23 ) && ( $m == 59 ) ) { # Assumes tests will take under 1 minute.
71+
plan skip_all => "Avoiding possible race condition at 23:59 UTC. Please rerun the test.";
72+
}
73+
else {
74+
create_users( $time, @users );
6875

69-
# ($nineteen_today, $eighteen_yesterday, $eighteen_today, $age_unknown) can all send to others in the group.
70-
# ($eighteen_in_1_to_4_days, $seventeen_today) can both send to other in the group.
71-
my @can_send = ( # [$sending_user, $receiving_user, $description] for "can send" cases
72-
[$nineteen_today, $eighteen_yesterday, "19+0 sending to 18+1"],
73-
[$nineteen_today, $eighteen_today, "19+0 sending to 18+0"],
74-
[$nineteen_today, $age_unknown, "19+0 sending to unknown age"],
75-
[$eighteen_yesterday, $nineteen_today, "18+1 sending to 19+0"],
76-
[$eighteen_yesterday, $eighteen_today, "18+1 sending to 18+0"],
77-
[$eighteen_yesterday, $age_unknown, "18+1 sending to unknown"],
78-
[$eighteen_today, $nineteen_today, "18+0 sending to 19+0"],
79-
[$eighteen_today, $eighteen_yesterday, "18+0 sending to 18+1"],
80-
[$eighteen_today, $age_unknown, "18+0 sending to unkwown"],
81-
[$age_unknown, $nineteen_today, "unknown sending to 19+0"],
82-
[$age_unknown, $eighteen_yesterday, "unknown sending to 18+1"],
83-
[$age_unknown, $eighteen_today, "unknown sending to 18+0"],
84-
[$eighteen_in_1_to_4_days, $seventeen_today, "18-1..4 sending to 17+0"],
85-
[$seventeen_today, $eighteen_in_1_to_4_days, "17+0 sending to 18-1..4"]
76+
# ($nineteen_today, $eighteen_yesterday, $eighteen_today, $age_unknown) can all send to others in the group.
77+
# ($eighteen_in_1_to_4_days, $seventeen_today) can both send to other in the group.
78+
my @can_send = ( # [$sending_user, $receiving_user, $description] for "can send" cases
79+
[ $nineteen_today, $eighteen_yesterday, "19+0 sending to 18+1" ],
80+
[ $nineteen_today, $eighteen_today, "19+0 sending to 18+0" ],
81+
[ $nineteen_today, $age_unknown, "19+0 sending to unknown age" ],
82+
[ $eighteen_yesterday, $nineteen_today, "18+1 sending to 19+0" ],
83+
[ $eighteen_yesterday, $eighteen_today, "18+1 sending to 18+0" ],
84+
[ $eighteen_yesterday, $age_unknown, "18+1 sending to unknown" ],
85+
[ $eighteen_today, $nineteen_today, "18+0 sending to 19+0" ],
86+
[ $eighteen_today, $eighteen_yesterday, "18+0 sending to 18+1" ],
87+
[ $eighteen_today, $age_unknown, "18+0 sending to unkwown" ],
88+
[ $age_unknown, $nineteen_today, "unknown sending to 19+0" ],
89+
[ $age_unknown, $eighteen_yesterday, "unknown sending to 18+1" ],
90+
[ $age_unknown, $eighteen_today, "unknown sending to 18+0" ],
91+
[ $eighteen_in_1_to_4_days, $seventeen_today, "18-1..4 sending to 17+0" ],
92+
[ $seventeen_today, $eighteen_in_1_to_4_days, "17+0 sending to 18-1..4" ]
8693
);
8794

8895
# ($nineteen_today, $eighteen_yesterday, $eighteen_today, $age_unknown) and
8996
# ($eighteen_in_1_to_4_days, $seventeen_today) cannot send to any in the other group
90-
my @cannot_send = ( # [$sending_user, $receiving_user, $description] for "can't send" cases
91-
[$nineteen_today, $eighteen_in_1_to_4_days, "19+0 trying to send to 18-1..4"],
92-
[$eighteen_yesterday, $eighteen_in_1_to_4_days, "18+1 trying to send to 18-1..4"],
93-
[$eighteen_today, $eighteen_in_1_to_4_days, "18+0 trying to send to 18-1..4"],
94-
[$age_unknown, $eighteen_in_1_to_4_days, "unknown trying to send to 18-1..4"],
95-
[$nineteen_today, $seventeen_today, "19+0 trying to send to 17+0"],
96-
[$eighteen_yesterday, $seventeen_today, "18+1 trying to send to 17+0"],
97-
[$eighteen_today, $seventeen_today, "18+0 trying to send to 17+0"],
98-
[$age_unknown, $seventeen_today, "unkwown trying to send to 17+0"],
99-
[$eighteen_in_1_to_4_days, $nineteen_today, "18-1..4 trying to send to 19+0"],
100-
[$seventeen_today, $nineteen_today, "17+0 trying to send to 19+0"],
101-
[$eighteen_in_1_to_4_days, $eighteen_yesterday, "18-1..4 trying to send to 18+1"],
102-
[$seventeen_today, $eighteen_yesterday, "17+0 trying to send to 18+0"],
103-
[$eighteen_in_1_to_4_days, $eighteen_today, "18-1..4 trying to send to 18+0"],
104-
[$seventeen_today, $eighteen_today, "17+0 trying to send to 18+0"],
105-
[$eighteen_in_1_to_4_days, $age_unknown, "18-1..4 trying to send to unknown"],
106-
[$seventeen_today, $age_unknown, "17+0 trying to send to unknown"]
97+
my @cannot_send = ( # [$sending_user, $receiving_user, $description] for "can't send" cases
98+
[ $nineteen_today, $eighteen_in_1_to_4_days, "19+0 trying to send to 18-1..4" ],
99+
[ $eighteen_yesterday, $eighteen_in_1_to_4_days, "18+1 trying to send to 18-1..4" ],
100+
[ $eighteen_today, $eighteen_in_1_to_4_days, "18+0 trying to send to 18-1..4" ],
101+
[ $age_unknown, $eighteen_in_1_to_4_days, "unknown trying to send to 18-1..4" ],
102+
[ $nineteen_today, $seventeen_today, "19+0 trying to send to 17+0" ],
103+
[ $eighteen_yesterday, $seventeen_today, "18+1 trying to send to 17+0" ],
104+
[ $eighteen_today, $seventeen_today, "18+0 trying to send to 17+0" ],
105+
[ $age_unknown, $seventeen_today, "unkwown trying to send to 17+0" ],
106+
[ $eighteen_in_1_to_4_days, $nineteen_today, "18-1..4 trying to send to 19+0" ],
107+
[ $seventeen_today, $nineteen_today, "17+0 trying to send to 19+0" ],
108+
[ $eighteen_in_1_to_4_days, $eighteen_yesterday, "18-1..4 trying to send to 18+1" ],
109+
[ $seventeen_today, $eighteen_yesterday, "17+0 trying to send to 18+0" ],
110+
[ $eighteen_in_1_to_4_days, $eighteen_today, "18-1..4 trying to send to 18+0" ],
111+
[ $seventeen_today, $eighteen_today, "17+0 trying to send to 18+0" ],
112+
[ $eighteen_in_1_to_4_days, $age_unknown, "18-1..4 trying to send to unknown" ],
113+
[ $seventeen_today, $age_unknown, "17+0 trying to send to unknown" ]
107114
);
108115
my $num_tests = scalar(@can_send) + scalar(@cannot_send);
109116

110117
# Actual tests
111118
plan tests => $num_tests;
112119
foreach my $test (@can_send) {
113-
my ($sending_user, $receiving_user, $description) = @$test;
114-
ok($receiving_user->can_receive_message($sending_user), $description);
120+
my ( $sending_user, $receiving_user, $description ) = @$test;
121+
ok( $receiving_user->can_receive_message($sending_user), $description );
115122
}
116123
foreach my $test (@cannot_send) {
117-
my ($sending_user, $receiving_user, $description) = @$test;
118-
ok(!$receiving_user->can_receive_message($sending_user), $description);
124+
my ( $sending_user, $receiving_user, $description ) = @$test;
125+
ok( !$receiving_user->can_receive_message($sending_user), $description );
119126
}
120127
}

0 commit comments

Comments
 (0)