1 files changed, 16 insertions, 35 deletions

diff --git a/lib/Travelynx/Model/Users.pm b/lib/Travelynx/Model/Users.pm
index 4602fa2..7d3777b 100644
--- a/lib/Travelynx/Model/Users.pm
+++ b/lib/Travelynx/Model/Users.pm
@@ -40,14 +40,6 @@ my %predicate_atoi = (
 	is_blocked_by   => 3,
 );
 
-my @sb_templates = (
-	undef,
-	[ 'DBF',         'https://dbf.finalrewind.org/{name}?rt=1#{tt}{tn}' ],
-	[ 'bahn.expert', 'https://bahn.expert/{name}#{id}' ],
-	[ 'DBF HAFAS', 'https://dbf.finalrewind.org/{name}?rt=1&hafas=1#{tt}{tn}' ],
-	[ 'bahn.expert/regional', 'https://bahn.expert/regional/{name}#{id}' ],
-);
-
 my %token_id = (
 	status  => 1,
 	history => 2,
@@ -213,6 +205,13 @@ sub get_privacy_by {
 	return;
 }
 
+sub set_backend {
+	my ( $self, %opt ) = @_;
+	$opt{db} //= $self->{pg}->db;
+
+	$opt{db}->update('users', {backend_id => $opt{backend_id}}, {id => $opt{uid}});
+}
+
 sub set_privacy {
 	my ( $self, %opt ) = @_;
 	my $db           = $opt{db} // $self->{pg}->db;
@@ -409,12 +408,13 @@ sub get {
 	my $uid = $opt{uid};
 
 	my $user = $db->select(
-		'users',
+		'users_with_backend',
 		'id, name, status, public_level, email, '
-		  . 'external_services, accept_follows, notifications, '
+		  . 'accept_follows, notifications, '
 		  . 'extract(epoch from registered_at) as registered_at_ts, '
 		  . 'extract(epoch from last_seen) as last_seen_ts, '
-		  . 'extract(epoch from deletion_requested) as deletion_requested_ts',
+		  . 'extract(epoch from deletion_requested) as deletion_requested_ts, '
+		  . 'backend_id, backend_name, hafas',
 		{ id => $uid }
 	)->hash;
 	if ($user) {
@@ -435,12 +435,8 @@ sub get {
 			past_status => $user->{public_level} & 0x08000 ? 1 : 0,
 			past_all    => $user->{public_level} & 0x10000 ? 1 : 0,
 			email       => $user->{email},
-			sb_name     => $user->{external_services}
-			? $sb_templates[ $user->{external_services} & 0x07 ][0]
-			: undef,
-			sb_template => $user->{external_services}
-			? $sb_templates[ $user->{external_services} & 0x07 ][1]
-			: undef,
+			sb_template =>
+			  'https://dbf.finalrewind.org/{name}?rt=1&hafas={hafas}#{tt}{tn}',
 			registered_at => DateTime->from_epoch(
 				epoch     => $user->{registered_at_ts},
 				time_zone => 'Europe/Berlin'
@@ -455,6 +451,9 @@ sub get {
 				time_zone => 'Europe/Berlin'
 			  )
 			: undef,
+			backend_id    => $user->{backend_id},
+			backend_name  => $user->{backend_name},
+			backend_hafas => $user->{hafas},
 		};
 	}
 	return undef;
@@ -659,24 +658,6 @@ sub use_history {
 	}
 }
 
-sub use_external_services {
-	my ( $self, %opt ) = @_;
-	my $db    = $opt{db} // $self->{pg}->db;
-	my $uid   = $opt{uid};
-	my $value = $opt{set};
-
-	if ( defined $value ) {
-		if ( $value < 0 or $value > 4 ) {
-			$value = 0;
-		}
-		$db->update( 'users', { external_services => $value }, { id => $uid } );
-	}
-	else {
-		return $db->select( 'users', ['external_services'], { id => $uid } )
-		  ->hash->{external_services};
-	}
-}
-
 sub get_webhook {
 	my ( $self, %opt ) = @_;
 	my $db  = $opt{db} // $self->{pg}->db;