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

DBRIS: parse and use links in messages, if any 

Closes #406
parent 60abed83

lib/Travelynx/Model/InTransit.pm

+18 −3
Original line number Diff line number Diff line
@@ -314,12 +314,17 @@ sub add { 
		my @messages;

		for my $msg ( $journey->messages ) {

			if ( not $msg->{ueberschrift} ) {

				my $url;

				if ( $msg->{text} =~ m{ ( http s? :// \S+ ) [.]?+ }x ) {

					$url = $1;

				}

				push(

					@{ $data->{him_msg} },

					{

						header => q{},

						prio   => $msg->{prioritaet},

						lead   => $msg->{text}

						lead   => $msg->{text},

						url    => $url,

					}

				);

				push(
@@ -1066,12 +1071,17 @@ sub update_departure_dbris { 
	$persistent_data->{him_msg} = [];

	for my $msg ( $journey->messages ) {

		if ( not $msg->{ueberschrift} ) {

			my $url;

			if ( $msg->{text} =~ m{ ( http s? :// \S+ ) [.]?+ }x ) {

				$url = $1;

			}

			push(

				@{ $ephemeral_data->{him_msg} },

				{

					header => q{},

					prio   => $msg->{prioritaet},

					lead   => $msg->{text}

					lead   => $msg->{text},

					url    => $url,

				}

			);

			push(
@@ -1274,12 +1284,17 @@ sub update_arrival_dbris { 
	$persistent_data->{him_msg} = [];

	for my $msg ( $journey->messages ) {

		if ( not $msg->{ueberschrift} ) {

			my $url;

			if ( $msg->{text} =~ m{ ( http s? :// \S+ ) [.]?+ }x ) {

				$url = $1;

			}

			push(

				@{ $ephemeral_data->{him_msg} },

				{

					header => q{},

					prio   => $msg->{prioritaet},

					lead   => $msg->{text}

					lead   => $msg->{text},

					url    => $url,

				}

			);

			push(

templates/_checked_in.html.ep

+6 −1
Original line number Diff line number Diff line
@@ -391,7 +391,12 @@ 
					<p style="margin-bottom: 2ex;">

						<ul>

							% for my $message (@{$journey->{extra_data}{him_msg} // []}) {

								<li> <i class="material-icons tiny"><%= ($message->{prio} and $message->{prio} eq 'HOCH') ? 'warning' : 'info' %></i> <%= $message->{header} %> <%= $message->{lead} %></li>

								% if ($message->{url}) {

									<li> <i class="material-icons tiny"><%= ($message->{prio} and $message->{prio} eq 'HOCH') ? 'warning' : 'info' %></i> <a href="<%= $message->{url} %>" class="contrast-color-text"> <%= $message->{header} %> <%= $message->{lead} %></a></li>

								% }

								% else {

									<li> <i class="material-icons tiny"><%= ($message->{prio} and $message->{prio} eq 'HOCH') ? 'warning' : 'info' %></i> <%= $message->{header} %> <%= $message->{lead} %> <%= $message->{url} %></li>

								% }

							% }

						</ul>

					</p>