Skip to content

Commit 413a80b

Browse files
ViLsonCakeViLsonCake
committed
bugfix
1 parent d16dbb7 commit 413a80b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

‎telegram-bot/src/main/java/project/vilsoncake/telegrambot/bot/ScheduleSender.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public void checkNewFlightAndSendsThem() throws TelegramApiException {
100100
message.setChatId(user.getChatId());
101101
message.setParseMode(MARKDOWN_PARSE_MODE);
102102
message.setText(String.format(botMessageUtils.getMessageByLanguage(AN_124_ON_GROUND_TEXT, user.getBotLanguage()),
103-
flight.getId().substring(flight.getId().length() - 4), geonameAirportDto.getName(), user.getAirport(), geonameCityDto.getName(), geonameCityDto.getCountryName(), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
103+
flight.getId().substring(flight.getId().length() - 4), geonameAirportDto.getName(), airportDto.getIata(), geonameCityDto.getName(), geonameCityDto.getCountryName(), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
104104
));
105105
absSender.execute(message);
106106
} catch (AirportNotFoundException e) {
@@ -124,13 +124,13 @@ public void checkNewFlightAndSendsThem() throws TelegramApiException {
124124
flightService.changeFlightTookOff(flightEntity, true);
125125
message.setParseMode(MARKDOWN_PARSE_MODE);
126126
message.setText(String.format(botMessageUtils.getMessageByLanguage(AN_124_TAKEOFF_TEXT, user.getBotLanguage()),
127-
flight.getId().substring(flight.getId().length() - 4), geonameAirportDto.getName(), user.getAirport(), geonameCityDto.getName(), geonameCityDto.getCountryName(), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
127+
flight.getId().substring(flight.getId().length() - 4), geonameAirportDto.getName(), airportDto.getIata(), geonameCityDto.getName(), geonameCityDto.getCountryName(), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
128128
));
129129
} else if (flight.getVerticalSpeed() < 0) {
130130
flightService.changeFlightLanding(flightEntity, true);
131131
message.setParseMode(MARKDOWN_PARSE_MODE);
132132
message.setText(String.format(botMessageUtils.getMessageByLanguage(AN_124_LANDING_TEXT, user.getBotLanguage()),
133-
flight.getId().substring(flight.getId().length() - 4), geonameAirportDto.getName(), user.getAirport(), geonameCityDto.getName(), geonameCityDto.getCountryName(), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
133+
flight.getId().substring(flight.getId().length() - 4), geonameAirportDto.getName(), airportDto.getIata(), geonameCityDto.getName(), geonameCityDto.getCountryName(), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
134134
));
135135
}
136136

@@ -203,7 +203,7 @@ public void checkNewFlightAndSendsThem() throws TelegramApiException {
203203
message.setChatId(user.getChatId());
204204
message.setParseMode(MARKDOWN_PARSE_MODE);
205205
message.setText(String.format(botMessageUtils.getMessageByLanguage(AN_124_ON_GROUND_TEXT, user.getBotLanguage()),
206-
flight.getId().substring(flight.getId().length() - 4), geonameAirportDto.getName(), user.getAirport(), geonameCityDto.getName(), geonameCityDto.getCountryName(), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
206+
flight.getId().substring(flight.getId().length() - 4), geonameAirportDto.getName(), airportDto.getIata(), geonameCityDto.getName(), geonameCityDto.getCountryName(), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
207207
));
208208
absSender.execute(message);
209209
} catch (AirportNotFoundException e) {
@@ -225,7 +225,7 @@ public void checkNewFlightAndSendsThem() throws TelegramApiException {
225225
message.setChatId(user.getChatId());
226226
message.setParseMode(MARKDOWN_PARSE_MODE);
227227
message.setText(String.format(botMessageUtils.getMessageByLanguage(AN_124_TAKEOFF_TEXT, user.getBotLanguage()),
228-
flight.getId().substring(flight.getId().length() - 4), geonameAirportDto.getName(), user.getAirport(), geonameCityDto.getName(), geonameCityDto.getCountryName(), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
228+
flight.getId().substring(flight.getId().length() - 4), geonameAirportDto.getName(), airportDto.getIata(), geonameCityDto.getName(), geonameCityDto.getCountryName(), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
229229
));
230230

231231
absSender.execute(message);
@@ -248,7 +248,7 @@ public void checkNewFlightAndSendsThem() throws TelegramApiException {
248248
message.setChatId(user.getChatId());
249249
message.setParseMode(MARKDOWN_PARSE_MODE);
250250
message.setText(String.format(botMessageUtils.getMessageByLanguage(AN_124_LANDING_TEXT, user.getBotLanguage()),
251-
flight.getId().substring(flight.getId().length() - 4), geonameAirportDto.getName(), user.getAirport(), geonameCityDto.getName(), geonameCityDto.getCountryName(), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
251+
flight.getId().substring(flight.getId().length() - 4), geonameAirportDto.getName(), airportDto.getIata(), geonameCityDto.getName(), geonameCityDto.getCountryName(), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
252252
));
253253

254254
absSender.execute(message);

0 commit comments

Comments
 (0)