kosyakmakc/TelegramBotFramework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing some compiler warnings

Browse Source
This commit is contained in:
Florian Zevedei 2023-09-12 14:11:59 +02:00
parent d21a5f8937
commit 809847ecd4
9 changed files with 50 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Examples/BotAndWebApplication/BotStuff/StartForm.cs
View File

@ -6,7 +6,7 @@ namespace BotAndWebApplication.BotStuff
{ {
public class StartForm : FormBase public class StartForm : FormBase
{ {
ButtonGrid _grid = null; ButtonGrid? _grid = null;
int MyCounter { get; set; } = 0; int MyCounter { get; set; } = 0;
@ -34,10 +34,10 @@ namespace BotAndWebApplication.BotStuff
AddControl(_grid); AddControl(_grid);
} }
private async Task _grid_ButtonClicked(object sender, TelegramBotBase.Args.ButtonClickedEventArgs e) private Task _grid_ButtonClicked(object sender, TelegramBotBase.Args.ButtonClickedEventArgs e)
{ {
if (e.Button == null || e.Button.Value == null) if (e.Button == null || e.Button.Value == null)
return; return Task.CompletedTask;
switch (e.Button.Value) switch (e.Button.Value)
{ {
@ -60,6 +60,7 @@ namespace BotAndWebApplication.BotStuff
} }
return Task.CompletedTask;
} }
} }
} }

8
Examples/InlineAndReplyCombination/Baseclasses/MultipleChoiceForm.cs
View File

@ -14,9 +14,9 @@ namespace InlineAndReplyCombination.Baseclasses
public class MultipleChoiceForm : AutoCleanForm public class MultipleChoiceForm : AutoCleanForm
{ {
[SaveState] [SaveState]
public UserDetails UserDetails { get; set; } public UserDetails? UserDetails { get; set; }
ButtonGrid ReplyButtonGrid; ButtonGrid? ReplyButtonGrid;
public String ReplyButtonTitle { get; set; } = "Restart"; public String ReplyButtonTitle { get; set; } = "Restart";
@ -28,7 +28,7 @@ namespace InlineAndReplyCombination.Baseclasses
this.Init += MultipleChoiceForm_Init; this.Init += MultipleChoiceForm_Init;
} }
private async Task MultipleChoiceForm_Init(object sender, TelegramBotBase.Args.InitEventArgs e) private Task MultipleChoiceForm_Init(object sender, TelegramBotBase.Args.InitEventArgs e)
{ {
//Reply keyboard //Reply keyboard
var bf = new ButtonForm(); var bf = new ButtonForm();
@ -43,6 +43,8 @@ namespace InlineAndReplyCombination.Baseclasses
ReplyButtonGrid.ButtonClicked += ReplyButtonGrid_ButtonClicked; ReplyButtonGrid.ButtonClicked += ReplyButtonGrid_ButtonClicked;
AddControl(ReplyButtonGrid); AddControl(ReplyButtonGrid);
return Task.CompletedTask;
} }

5
Examples/InlineAndReplyCombination/Forms/StartForm.cs
View File

@ -13,7 +13,7 @@ namespace InlineAndReplyCombination.Forms
{ {
public class StartForm : AutoCleanForm public class StartForm : AutoCleanForm
{ {
ButtonGrid buttonGrid; ButtonGrid? buttonGrid;
public StartForm() public StartForm()
{ {
@ -21,7 +21,7 @@ namespace InlineAndReplyCombination.Forms
} }
private async Task StartForm_Init(object sender, TelegramBotBase.Args.InitEventArgs e) private Task StartForm_Init(object sender, TelegramBotBase.Args.InitEventArgs e)
{ {
var bf = new ButtonForm(); var bf = new ButtonForm();
@ -35,6 +35,7 @@ namespace InlineAndReplyCombination.Forms
AddControl(buttonGrid); AddControl(buttonGrid);
return Task.CompletedTask;
} }
private async Task ButtonGrid_ButtonClicked(object sender, TelegramBotBase.Args.ButtonClickedEventArgs e) private async Task ButtonGrid_ButtonClicked(object sender, TelegramBotBase.Args.ButtonClickedEventArgs e)

14
Examples/InlineAndReplyCombination/Forms/Steps/MainForm.cs
View File

@ -15,9 +15,9 @@ namespace InlineAndReplyCombination.Forms.Steps
public class MainForm : MultipleChoiceForm public class MainForm : MultipleChoiceForm
{ {
ButtonGrid InlineButtonGrid; ButtonGrid? InlineButtonGrid;
public static List<Tuple<String, String>> AllowedInlineInputs = null; public static List<Tuple<String, String>> AllowedInlineInputs;
static MainForm() static MainForm()
{ {
@ -41,7 +41,7 @@ namespace InlineAndReplyCombination.Forms.Steps
CurrentStep = 1; CurrentStep = 1;
} }
private async Task MainForm_Init(object sender, TelegramBotBase.Args.InitEventArgs e) private Task MainForm_Init(object sender, TelegramBotBase.Args.InitEventArgs e)
{ {
//Inline Keyboard //Inline Keyboard
@ -61,6 +61,7 @@ namespace InlineAndReplyCombination.Forms.Steps
AddControl(InlineButtonGrid); AddControl(InlineButtonGrid);
return Task.CompletedTask;
} }
private async Task InlineButtonGrid_ButtonClicked(object sender, TelegramBotBase.Args.ButtonClickedEventArgs e) private async Task InlineButtonGrid_ButtonClicked(object sender, TelegramBotBase.Args.ButtonClickedEventArgs e)
@ -72,7 +73,12 @@ namespace InlineAndReplyCombination.Forms.Steps
return; return;
} }
this.UserDetails.AgeRange = e.Button?.Value ?? "unknown"; if (UserDetails == null)
{
return;
}
UserDetails.AgeRange = e.Button?.Value ?? "unknown";
var sf = new SecondForm(); var sf = new SecondForm();

14
Examples/InlineAndReplyCombination/Forms/Steps/SecondForm.cs
View File

@ -15,9 +15,9 @@ namespace InlineAndReplyCombination.Forms.Steps
public class SecondForm : MultipleChoiceForm public class SecondForm : MultipleChoiceForm
{ {
ButtonGrid InlineButtonGrid; ButtonGrid? InlineButtonGrid;
public static List<Tuple<String, String>> AllowedInlineInputs = null; public static List<Tuple<String, String>> AllowedInlineInputs;
static SecondForm() static SecondForm()
{ {
@ -42,7 +42,7 @@ namespace InlineAndReplyCombination.Forms.Steps
} }
private async Task SecondForm_Init(object sender, TelegramBotBase.Args.InitEventArgs e) private Task SecondForm_Init(object sender, TelegramBotBase.Args.InitEventArgs e)
{ {
//Inline Keyboard //Inline Keyboard
@ -60,6 +60,7 @@ namespace InlineAndReplyCombination.Forms.Steps
AddControl(InlineButtonGrid); AddControl(InlineButtonGrid);
return Task.CompletedTask;
} }
private async Task InlineButtonGrid_ButtonClicked(object sender, TelegramBotBase.Args.ButtonClickedEventArgs e) private async Task InlineButtonGrid_ButtonClicked(object sender, TelegramBotBase.Args.ButtonClickedEventArgs e)
@ -71,7 +72,12 @@ namespace InlineAndReplyCombination.Forms.Steps
return; return;
} }
this.UserDetails.FavouriteColor = e.Button?.Value ?? "unknown"; if (UserDetails == null)
{
return;
}
UserDetails.FavouriteColor = e.Button?.Value ?? "unknown";
var tf = new ThirdForm(); var tf = new ThirdForm();

7
Examples/InlineAndReplyCombination/Forms/Steps/Summary.cs
View File

@ -14,9 +14,9 @@ namespace InlineAndReplyCombination.Forms.Steps
public class Summary : AutoCleanForm public class Summary : AutoCleanForm
{ {
[SaveState] [SaveState]
public UserDetails UserDetails { get; set; } public UserDetails? UserDetails { get; set; }
ButtonGrid ReplyButtonGrid { get; set; } ButtonGrid? ReplyButtonGrid { get; set; }
public Summary() public Summary()
{ {
@ -24,7 +24,7 @@ namespace InlineAndReplyCombination.Forms.Steps
} }
private async Task Summary_Init(object sender, TelegramBotBase.Args.InitEventArgs e) private Task Summary_Init(object sender, TelegramBotBase.Args.InitEventArgs e)
{ {
var bf = new ButtonForm(); var bf = new ButtonForm();
@ -39,6 +39,7 @@ namespace InlineAndReplyCombination.Forms.Steps
AddControl(ReplyButtonGrid); AddControl(ReplyButtonGrid);
return Task.CompletedTask;
} }
public override async Task Load(MessageResult message) public override async Task Load(MessageResult message)

14
Examples/InlineAndReplyCombination/Forms/Steps/ThirdForm.cs
View File

@ -15,9 +15,9 @@ namespace InlineAndReplyCombination.Forms.Steps
public class ThirdForm : MultipleChoiceForm public class ThirdForm : MultipleChoiceForm
{ {
ButtonGrid InlineButtonGrid; ButtonGrid? InlineButtonGrid;
public static List<Tuple<String, String>> AllowedInlineInputs = null; public static List<Tuple<String, String>> AllowedInlineInputs;
static ThirdForm() static ThirdForm()
{ {
@ -41,7 +41,7 @@ namespace InlineAndReplyCombination.Forms.Steps
} }
private async Task SecondForm_Init(object sender, TelegramBotBase.Args.InitEventArgs e) private Task SecondForm_Init(object sender, TelegramBotBase.Args.InitEventArgs e)
{ {
//Inline Keyboard //Inline Keyboard
@ -59,6 +59,7 @@ namespace InlineAndReplyCombination.Forms.Steps
AddControl(InlineButtonGrid); AddControl(InlineButtonGrid);
return Task.CompletedTask;
} }
private async Task InlineButtonGrid_ButtonClicked(object sender, TelegramBotBase.Args.ButtonClickedEventArgs e) private async Task InlineButtonGrid_ButtonClicked(object sender, TelegramBotBase.Args.ButtonClickedEventArgs e)
@ -70,7 +71,12 @@ namespace InlineAndReplyCombination.Forms.Steps
return; return;
} }
this.UserDetails.FavouriteCity = e.Button?.Value ?? "unknown"; if (UserDetails == null)
{
return;
}
UserDetails.FavouriteCity = e.Button?.Value ?? "unknown";
var sum = new Summary(); var sum = new Summary();
sum.UserDetails = this.UserDetails; sum.UserDetails = this.UserDetails;

6
Examples/InlineAndReplyCombination/Model/UserDetails.cs
View File

@ -10,11 +10,11 @@ namespace InlineAndReplyCombination.Model
[DebuggerDisplay("{AgeRange}, {FavouriteColor}, {FavouriteCity}")] [DebuggerDisplay("{AgeRange}, {FavouriteColor}, {FavouriteCity}")]
public class UserDetails public class UserDetails
{ {
public String AgeRange { get; set; } public String? AgeRange { get; set; }
public String FavouriteColor { get; set; } public String? FavouriteColor { get; set; }
public String FavouriteCity { get; set; } public String? FavouriteCity { get; set; }
} }
} }

2
Examples/InlineAndReplyCombination/Program.cs
View File

@ -6,7 +6,7 @@ namespace InlineAndReplyCombination
{ {
internal class Program internal class Program
{ {
public static BotBase BotBaseInstance { get; private set; } public static BotBase? BotBaseInstance { get; private set; }
static async Task Main(string[] args) static async Task Main(string[] args)
{ {