- /showmap -> /map

Author: devgopher

Botticelli.Locations.Telegram/Extensions/ServiceCollectionExtensions.cs

@@ -34,9 +34,9 @@ public static IServiceCollection AddOsmLocations(this IServiceCollection service
         TypeAdapterConfig.GlobalSettings.Scan(Assembly.GetExecutingAssembly());
         return services.Configure<LocationsProcessorOptions>(config)
             .AddScoped<ICommandValidator<FindLocationsCommand>, PassValidator<FindLocationsCommand>>()
-            .AddScoped<ICommandValidator<ShowMapCommand>, PassValidator<ShowMapCommand>>()
+            .AddScoped<ICommandValidator<MapCommand>, PassValidator<MapCommand>>()
             .AddScoped<FindLocationsCommandProcessor<InlineKeyboardMarkup>>()
-            .AddScoped<ShowMapCommandProcessor<ReplyKeyboardMarkup>>()
+            .AddScoped<MapCommandProcessor<ReplyKeyboardMarkup>>()
             .AddScoped<ILocationProvider, OsmLocationProvider>()
             .AddScoped<INominatimWebInterface, NominatimWebInterface>()
             .AddScoped<IAddressSearcher, AddressSearcher>()
@@ -53,5 +53,5 @@ public static IServiceCollection AddOsmLocations(this IServiceCollection service
     public static IServiceProvider RegisterOsmLocationsCommands(this IServiceProvider sp,
         string url = "https://nominatim.openstreetmap.org") =>
         sp.RegisterBotCommand<FindLocationsCommand, FindLocationsCommandProcessor<InlineKeyboardMarkup>, TelegramBot>()
-          .RegisterBotCommand<ShowMapCommand, ShowMapCommandProcessor<ReplyKeyboardMarkup>, TelegramBot>();
+          .RegisterBotCommand<MapCommand, MapCommandProcessor<ReplyKeyboardMarkup>, TelegramBot>();
 }

Botticelli.Locations.Vk/Extensions/ServiceCollectionExtensions.cs

@@ -36,7 +36,7 @@ public static IServiceCollection AddOsmLocations(this IServiceCollection service
         return services.Configure<LocationsProcessorOptions>(config)
             .AddScoped<ICommandValidator<FindLocationsCommand>, PassValidator<FindLocationsCommand>>()
             .AddScoped<FindLocationsCommandProcessor<VkKeyboardMarkup>>()
-            .AddScoped<ShowMapCommandProcessor<VkKeyboardMarkup>>()
+            .AddScoped<MapCommandProcessor<VkKeyboardMarkup>>()
             .AddScoped<ILocationProvider, OsmLocationProvider>()
             .AddScoped<INominatimWebInterface, NominatimWebInterface>()
             .AddScoped<IAddressSearcher, AddressSearcher>()
@@ -52,5 +52,5 @@ public static IServiceCollection AddOsmLocations(this IServiceCollection service
     public static IServiceProvider RegisterOsmLocationsCommands(this IServiceProvider sp,
         string url = "https://nominatim.openstreetmap.org")
         => sp.RegisterBotCommand<FindLocationsCommand, FindLocationsCommandProcessor<VkKeyboardMarkup>, VkBot>()
-            .RegisterBotCommand<ShowMapCommand, ShowMapCommandProcessor<VkKeyboardMarkup>, VkBot>();
+            .RegisterBotCommand<MapCommand, MapCommandProcessor<VkKeyboardMarkup>, VkBot>();
 }

Botticelli.Locations/Commands/CommandProcessors/FindLocationsCommandProcessor.cs

@@ -47,7 +47,7 @@ protected override async Task InnerProcess(Message message, string args, Cancell
                 Control = new Button
                 {
                     Content = result.DisplayName,
-                    CallbackData = $"/ShowMap {cdata}"
+                    CallbackData = $"/Map {cdata}"
                 },
                 Params = new ItemParams()
             });

…andProcessors/ShowMapCommandProcessor.cs …CommandProcessors/MapCommandProcessor.csBotticelli.Locations/Commands/CommandProcessors/ShowMapCommandProcessor.cs renamed to Botticelli.Locations/Commands/CommandProcessors/MapCommandProcessor.cs Botticelli.Locations/Commands/CommandProcessors/ShowMapCommandProcessor.cs renamed to Botticelli.Locations/Commands/CommandProcessors/MapCommandProcessor.cs

@@ -9,15 +9,15 @@
 
 namespace Botticelli.Locations.Commands.CommandProcessors;
 
-public class ShowMapCommandProcessor<TReplyMarkup> : CommandProcessor<ShowMapCommand>
+public class MapCommandProcessor<TReplyMarkup> : CommandProcessor<MapCommand>
     where TReplyMarkup : class
 {
     private readonly ILocationProvider _locationProvider;
     private readonly ILayoutSupplier<TReplyMarkup> _layoutSupplier;
 
 
-    public ShowMapCommandProcessor(ILogger<FindLocationsCommandProcessor<TReplyMarkup>> logger,
-        ICommandValidator<ShowMapCommand> validator,
+    public MapCommandProcessor(ILogger<FindLocationsCommandProcessor<TReplyMarkup>> logger,
+        ICommandValidator<MapCommand> validator,
         MetricsProcessor metricsProcessor,
         ILocationProvider locationProvider,
         ILayoutSupplier<TReplyMarkup> layoutSupplier) : base(logger, validator, metricsProcessor)

…lli.Locations/Commands/ShowMapCommand.cs …ticelli.Locations/Commands/MapCommand.csBotticelli.Locations/Commands/ShowMapCommand.cs renamed to Botticelli.Locations/Commands/MapCommand.cs Botticelli.Locations/Commands/ShowMapCommand.cs renamed to Botticelli.Locations/Commands/MapCommand.cs

@@ -2,7 +2,7 @@
 
 namespace Botticelli.Locations.Commands;
 
-public class ShowMapCommand : ICommand
+public class MapCommand : ICommand
 {
     public Guid Id { get; }
 }