Unverified Commit c9bae6fc authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

journeys: simplify visibily check

parent a608ca67

lib/Travelynx/Controller/Profile.pm

+0 −15
Original line number Diff line number Diff line
@@ -134,21 +134,6 @@ sub profile { 
			$opt{after}  = $now->clone->subtract( weeks => 4 );

		}



		if (

			$user->{default_visibility_str} eq 'public'

			or ( $user->{default_visibility_str} eq 'travelynx'

				and ( $my_user or $is_self ) )

			or (    $user->{default_visibility_str} eq 'followers'

				and $relation

				and $relation eq 'follows' )

		  )

		{

			$opt{with_default_visibility} = 1;

		}

		else {

			$opt{with_default_visibility} = 0;

		}



		if ($is_self) {

			$opt{min_visibility} = 'followers';

		}

lib/Travelynx/Model/Journeys.pm

+1 −12
Original line number Diff line number Diff line
@@ -562,18 +562,7 @@ sub get { 
		if ( $visibility_atoi{ $opt{min_visibility} } ) {

			$opt{min_visibility} = $visibility_atoi{ $opt{min_visibility} };

		}

		if ( $opt{with_default_visibility} ) {

			$where{visibility} = [

				-or => { '=', undef },

				{ '>=', $opt{min_visibility} }

			];

		}

		else {

			$where{visibility} = [

				-and => { '!=', undef },

				{ '>=', $opt{min_visibility} }

			];

		}

		$where{effective_visibility} = { '>=', $opt{min_visibility} };

	}



	my @travels;