- adding new SentData Event in FormBase for User uploads (for Photo, Audio, Video, Contact, Location, Document)

- adding RequestUserLocation and RequestUserContact to Device class - Update to Device class - updating examples - adding example for data upload - small documentary Updates (Readme.md)
2019-03-27 14:01:48 +07:00
parent 5cd54fc746
commit b14fa2dc87
12 changed files with 348 additions and 19 deletions
@@ -0,0 +1,129 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Telegram.Bot.Types;
+using Telegram.Bot.Types.InputFiles;
+
+namespace TelegramBotBase.Base
+{
+    /// <summary>
+    /// Returns a class to manage attachments within messages.
+    /// </summary>
+    public class DataResult : ResultBase
+    {
+        public Telegram.Bot.Args.MessageEventArgs RawMessageData { get; set; }
+
+        public Contact Contact
+        {
+            get
+            {
+                return this.Message.Contact;
+            }
+        }
+
+        public Location Location
+        {
+            get
+            {
+                return this.Message.Location;
+            }
+        }
+
+        public Document Document
+        {
+            get
+            {
+                return this.Message.Document;
+            }
+        }
+
+        public Audio Audio
+        {
+            get
+            {
+                return this.Message.Audio;
+            }
+        }
+
+        public Video Video
+        {
+            get
+            {
+                return this.Message.Video;
+            }
+        }
+
+        public PhotoSize[] Photos
+        {
+            get
+            {
+                return this.Message.Photo;
+            }
+        }
+
+        public Telegram.Bot.Types.Enums.MessageType Type
+        {
+            get
+            {
+                return this.RawMessageData?.Message?.Type ?? Telegram.Bot.Types.Enums.MessageType.Unknown;
+            }
+        }
+
+        /// <summary>
+        /// Returns the FileId of the first reachable element.
+        /// </summary>
+        public String FileId
+        {
+            get
+            {
+                return (this.Document?.FileId ??
+                        this.Audio?.FileId ??
+                        this.Video?.FileId ??
+                        this.Photos.FirstOrDefault()?.FileId);
+            }
+        }
+
+
+        public DataResult(Telegram.Bot.Args.MessageEventArgs rawdata)
+        {
+            this.RawMessageData = rawdata;
+            this.Message = rawdata.Message;
+        }
+
+        public DataResult(MessageResult message)
+        {
+            this.RawMessageData = message.RawMessageData;
+            this.Message = message.Message;
+
+            
+        }
+
+        public async Task<InputOnlineFile> DownloadDocument()
+        {
+            var encryptedContent = new System.IO.MemoryStream(this.Document.FileSize);
+            var file = await this.Client.TelegramClient.GetInfoAndDownloadFileAsync(this.Document.FileId, encryptedContent);
+            
+            return new InputOnlineFile(encryptedContent, this.Document.FileName);
+        }
+
+        public async Task<InputOnlineFile> DownloadVideo()
+        {
+            var encryptedContent = new System.IO.MemoryStream(this.Video.FileSize);
+            var file = await this.Client.TelegramClient.GetInfoAndDownloadFileAsync(this.Video.FileId, encryptedContent);
+
+            return new InputOnlineFile(encryptedContent, "");
+        }
+
+        public async Task<InputOnlineFile> DownloadPhoto(int index)
+        {
+            var photo = this.Photos[index];
+            var encryptedContent = new System.IO.MemoryStream(photo.FileSize);
+            var file = await this.Client.TelegramClient.GetInfoAndDownloadFileAsync(photo.FileId, encryptedContent);
+            
+            return new InputOnlineFile(encryptedContent, "");
+        }
+
+    }
+}
@@ -86,6 +86,16 @@ namespace TelegramBotBase.Form

        }

+        /// <summary>
+        /// Gets invoked if the user has sent some media (Photo, Audio, Video, Contact, Location, Document)
+        /// </summary>
+        /// <param name="message"></param>
+        /// <returns></returns>
+        public virtual async Task SentData(DataResult message)
+        {
+
+        }
+
        /// <summary>
        /// Gets invoked at the end of the cycle to "Render" text, images, buttons, etc...
        /// </summary>
@@ -267,6 +267,13 @@ namespace TelegramBotBase
                //Loading Event
                await activeForm.Load(e);

+                //Is Attachment ? (Photo, Audio, Video, Contact, Location, Document)
+                if (e.Message.Type == Telegram.Bot.Types.Enums.MessageType.Contact | e.Message.Type == Telegram.Bot.Types.Enums.MessageType.Document | e.Message.Type == Telegram.Bot.Types.Enums.MessageType.Location |
+                    e.Message.Type == Telegram.Bot.Types.Enums.MessageType.Photo | e.Message.Type == Telegram.Bot.Types.Enums.MessageType.Video | e.Message.Type == Telegram.Bot.Types.Enums.MessageType.Audio)
+                {
+                    await activeForm.SentData(new DataResult(e));
+                }
+
                //Render Event
                if (!activeForm.FormSwitched)
                    await activeForm.Render(e);
@@ -38,6 +38,15 @@ namespace TelegramBotBase.Form
            this.Buttons = Buttons.ToList();
        }

+        /// <summary>
+        /// Adds one Button
+        /// </summary>
+        /// <param name="button"></param>
+        public void AddButton(ButtonBase button)
+        {
+            this.Buttons.Add(button);
+        }
+
        public override async Task Action(MessageResult message)
        {
            var call = message.GetData<CallbackData>();
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.1.3")]
-[assembly: AssemblyFileVersion("1.3.1.3")]
+[assembly: AssemblyVersion("1.4.0.0")]
+[assembly: AssemblyFileVersion("1.4.0.0")]
@@ -114,6 +114,7 @@ namespace TelegramBotBase.Sessions
            try
            {
                var m = await this.Client.TelegramClient.EditMessageTextAsync(this.DeviceId, messageId, text, replyMarkup: markup);
+
                return m;
            }
            catch
@@ -149,6 +150,8 @@ namespace TelegramBotBase.Sessions
            try
            {
                m = await (this.Client.TelegramClient.SendTextMessageAsync(this.DeviceId, text, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification));
+
+                OnMessageSent(new MessageSentEventArgs(m.MessageId, m));
            }
            catch (ApiRequestException ex)
            {
@@ -159,9 +162,6 @@ namespace TelegramBotBase.Sessions
                return null;
            }

-
-            OnMessageSent(new MessageSentEventArgs(m.MessageId, m));
-
            return m;
        }

@@ -183,6 +183,8 @@ namespace TelegramBotBase.Sessions
            try
            {
                m = await (this.Client.TelegramClient.SendTextMessageAsync(this.DeviceId, text, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification));
+
+                OnMessageSent(new MessageSentEventArgs(m.MessageId, m));
            }
            catch (ApiRequestException ex)
            {
@@ -193,8 +195,6 @@ namespace TelegramBotBase.Sessions
                return null;
            }

-            OnMessageSent(new MessageSentEventArgs(m.MessageId, m));
-
            return m;
        }

@@ -222,6 +222,8 @@ namespace TelegramBotBase.Sessions
            try
            {
                m = await this.Client.TelegramClient.SendPhotoAsync(this.DeviceId, file, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification);
+
+                OnMessageSent(new MessageSentEventArgs(m.MessageId, m));
            }
            catch (ApiRequestException ex)
            {
@@ -232,8 +234,6 @@ namespace TelegramBotBase.Sessions
                return null;
            }

-            OnMessageSent(new MessageSentEventArgs(m.MessageId, m));
-
            return m;
        }

@@ -318,7 +318,7 @@ namespace TelegramBotBase.Sessions
            }

            var m = await this.Client.TelegramClient.SendDocumentAsync(this.DeviceId, document, caption, replyMarkup: markup, disableNotification: disableNotification, replyToMessageId: replyTo);
-
+            
            OnMessageSent(new MessageSentEventArgs(m.MessageId, m));

            return m;
@@ -339,11 +339,12 @@ namespace TelegramBotBase.Sessions
        /// </summary>
        /// <param name="buttonText"></param>
        /// <param name="requestMessage"></param>
+        /// <param name="OneTimeOnly"></param>
        /// <returns></returns>
-        public async Task<Message> RequestContact(String buttonText = "Send your contact", String requestMessage = "Give me your phone number!")
+        public async Task<Message> RequestContact(String buttonText = "Send your contact", String requestMessage = "Give me your phone number!", bool OneTimeOnly = true)
        {
            var rck = new ReplyKeyboardMarkup(KeyboardButton.WithRequestContact(buttonText));
-
+            rck.OneTimeKeyboard = OneTimeOnly;
            return await this.Client.TelegramClient.SendTextMessageAsync(this.DeviceId, requestMessage, replyMarkup: rck);
        }

@@ -352,11 +353,12 @@ namespace TelegramBotBase.Sessions
        /// </summary>
        /// <param name="buttonText"></param>
        /// <param name="requestMessage"></param>
+        /// <param name="OneTimeOnly"></param>
        /// <returns></returns>
-        public async Task<Message> RequestLocation(String buttonText = "Send your location", String requestMessage = "Give me your location!")
+        public async Task<Message> RequestLocation(String buttonText = "Send your location", String requestMessage = "Give me your location!", bool OneTimeOnly = true)
        {
            var rcl = new ReplyKeyboardMarkup(KeyboardButton.WithRequestLocation(buttonText));
-            
+            rcl.OneTimeKeyboard = OneTimeOnly;
            return await this.Client.TelegramClient.SendTextMessageAsync(this.DeviceId, requestMessage, replyMarkup: rcl);
        }

@@ -51,6 +51,7 @@
  <ItemGroup>
    <Compile Include="Base\ButtonClickedEventArgs.cs" />
    <Compile Include="Base\ControlBase.cs" />
+    <Compile Include="Base\DataResult.cs" />
    <Compile Include="Base\MessageClient.cs" />
    <Compile Include="Base\MessageIncomeResult.cs" />
    <Compile Include="Base\MessageResult.cs" />