Integrating Images Project

2021-11-28 23:20:56 +01:00 · 2021-11-28 23:20:56 +01:00 · e28663138b
commit e28663138b
parent 65ec7f1c2b
7 changed files with 93 additions and 69 deletions
--- a/TelegramBotBase.Extensions.Images/ImageExtensions.cs
+++ b/TelegramBotBase.Extensions.Images/ImageExtensions.cs
@ -0,0 +1,61 @@
+using System;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Threading.Tasks;
+using Telegram.Bot.Types.InputFiles;
+using Telegram.Bot.Types;
+using TelegramBotBase.Sessions;
+using TelegramBotBase.Form;
+
+namespace TelegramBotBase.Extensions.Images
+{
+    public static class ImageExtensions
+    {
+        public static Stream ToStream(this Image image, ImageFormat format)
+        {
+            var stream = new System.IO.MemoryStream();
+            image.Save(stream, format);
+            stream.Position = 0;
+            return stream;
+        }
+
+        /// <summary>
+        /// Sends an image
+        /// </summary>
+        /// <param name="image"></param>
+        /// <param name="name"></param>
+        /// <param name="buttons"></param>
+        /// <param name="replyTo"></param>
+        /// <param name="disableNotification"></param>
+        /// <returns></returns>
+        public static async Task<Message> SendPhoto(this DeviceSession session, Image image, String name, String caption, ButtonForm buttons = null, int replyTo = 0, bool disableNotification = false)
+        {
+            using (var fileStream = Tools.Images.ToStream(image, ImageFormat.Png))
+            {
+                InputOnlineFile fts = new InputOnlineFile(fileStream, name);
+
+                return await session.SendPhoto(fts, caption: caption, buttons, replyTo, disableNotification);
+            }
+        }
+
+        /// <summary>
+        /// Sends an image
+        /// </summary>
+        /// <param name="image"></param>
+        /// <param name="name"></param>
+        /// <param name="buttons"></param>
+        /// <param name="replyTo"></param>
+        /// <param name="disableNotification"></param>
+        /// <returns></returns>
+        public static async Task<Message> SendPhoto(this DeviceSession session, Bitmap image, String name, String caption, ButtonForm buttons = null, int replyTo = 0, bool disableNotification = false)
+        {
+            using (var fileStream = Tools.Images.ToStream(image, ImageFormat.Png))
+            {
+                InputOnlineFile fts = new InputOnlineFile(fileStream, name);
+
+                return await session.SendPhoto(fts, caption: caption, buttons, replyTo, disableNotification);
+            }
+        }
+    }
+}
--- a/TelegramBotBase.Extensions.Images/TelegramBotBase.Extensions.Images.csproj
+++ b/TelegramBotBase.Extensions.Images/TelegramBotBase.Extensions.Images.csproj
@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.1;net472;net5;netcoreapp3.1;net6</TargetFrameworks>
+    <RepositoryUrl>https://github.com/MajMcCloud/TelegramBotFramework</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/MajMcCloud/TelegramBotFramework</PackageProjectUrl>
+    <Copyright>MIT</Copyright>
+    
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+    <PackageReference Include="Telegram.Bot" Version="17.0.0" />
+    <PackageReference Include="TelegramBotBase" Version="5.0.2-alpha" />
+  </ItemGroup>
+
+</Project>
--- a/TelegramBotBase/Sessions/DeviceSession.cs
+++ b/TelegramBotBase/Sessions/DeviceSession.cs
@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Text;
@ -422,44 +420,6 @@ namespace TelegramBotBase.Sessions
            }
        }

-        /// <summary>
-        /// Sends an image
-        /// </summary>
-        /// <param name="image"></param>
-        /// <param name="name"></param>
-        /// <param name="buttons"></param>
-        /// <param name="replyTo"></param>
-        /// <param name="disableNotification"></param>
-        /// <returns></returns>
-        public async Task<Message> SendPhoto(Image image, String name, String caption, ButtonForm buttons = null, int replyTo = 0, bool disableNotification = false)
-        {
-            using (var fileStream = Tools.Images.ToStream(image, ImageFormat.Png))
-            {
-                InputOnlineFile fts = new InputOnlineFile(fileStream, name);
-
-                return await SendPhoto(fts, caption: caption, buttons, replyTo, disableNotification);
-            }
-        }
-
-        /// <summary>
-        /// Sends an image
-        /// </summary>
-        /// <param name="image"></param>
-        /// <param name="name"></param>
-        /// <param name="buttons"></param>
-        /// <param name="replyTo"></param>
-        /// <param name="disableNotification"></param>
-        /// <returns></returns>
-        public async Task<Message> SendPhoto(Bitmap image, String name, String caption, ButtonForm buttons = null, int replyTo = 0, bool disableNotification = false)
-        {
-            using (var fileStream = Tools.Images.ToStream(image, ImageFormat.Png))
-            {
-                InputOnlineFile fts = new InputOnlineFile(fileStream, name);
-
-                return await SendPhoto(fts, caption: caption, buttons, replyTo, disableNotification);
-            }
-        }
-
        /// <summary>
        /// Sends an video
        /// </summary>
--- a/TelegramBotBase/TelegramBotBase.csproj
+++ b/TelegramBotBase/TelegramBotBase.csproj
@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net472;net5;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net472;net5;netcoreapp3.1;net6</TargetFrameworks>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
    <PackageProjectUrl>https://github.com/MajMcCloud/TelegramBotFramework</PackageProjectUrl>
    <RepositoryUrl>https://github.com/MajMcCloud/TelegramBotFramework</RepositoryUrl>
@ -16,6 +16,9 @@
    <PublishRepositoryUrl>true</PublishRepositoryUrl>
    <IncludeSymbols>true</IncludeSymbols>
    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <Version>$(VersionPrefix)</Version>
+    <AssemblyVersion></AssemblyVersion>
+    <FileVersion></FileVersion>
  </PropertyGroup>

  <ItemGroup>
@ -28,7 +31,7 @@
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
@ -64,10 +67,8 @@


  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
    <PackageReference Include="System.ComponentModel" Version="4.3.0" />
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
    <PackageReference Include="System.Net.Http" Version="4.3.4" />
    <PackageReference Include="Telegram.Bot" Version="17.0.0" />
    <PackageReference Include="Telegram.Bot.Extensions.Polling" Version="1.0.0" />
--- a/TelegramBotBase/Tools/Images.cs
+++ b/TelegramBotBase/Tools/Images.cs
@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace TelegramBotBase.Tools
-{
-    public static class Images
-    {
-        public static Stream ToStream(this Image image, ImageFormat format)
-        {
-            var stream = new System.IO.MemoryStream();
-            image.Save(stream, format);
-            stream.Position = 0;
-            return stream;
-        }
-    }
-}
--- a/TelegramBotBaseTest/TelegramBotBaseTest.csproj
+++ b/TelegramBotBaseTest/TelegramBotBaseTest.csproj
@ -27,6 +27,7 @@
  </PropertyGroup>

  <ItemGroup>
+    <ProjectReference Include="..\TelegramBotBase.Extensions.Images\TelegramBotBase.Extensions.Images.csproj" />
    <ProjectReference Include="..\TelegramBotBase\TelegramBotBase.csproj" />
  </ItemGroup>

--- a/TelegramBotFramework.sln
+++ b/TelegramBotFramework.sln
@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29324.140
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31912.275
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelegramBotBase", "TelegramBotBase\TelegramBotBase.csproj", "{0BD16FB9-7ED4-4CCB-83EB-5CEE538E1B6C}"
 EndProject
@ -18,6 +18,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SystemCommandsBot", "Exampl
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JoinHiderBot", "Examples\JoinHiderBot\JoinHiderBot.csproj", "{E804B9E5-7ACC-49D3-9253-806766C1D9A5}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TelegramBotBase.Extensions.Images", "TelegramBotBase.Extensions.Images\TelegramBotBase.Extensions.Images.csproj", "{B5DDFA45-0E01-46A5-B67D-541300CDD606}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -40,6 +42,10 @@ Global
 		{E804B9E5-7ACC-49D3-9253-806766C1D9A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E804B9E5-7ACC-49D3-9253-806766C1D9A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E804B9E5-7ACC-49D3-9253-806766C1D9A5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B5DDFA45-0E01-46A5-B67D-541300CDD606}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5DDFA45-0E01-46A5-B67D-541300CDD606}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5DDFA45-0E01-46A5-B67D-541300CDD606}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B5DDFA45-0E01-46A5-B67D-541300CDD606}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE