From a3d96c303f71b2433a2e6696d514ef2ea24d1036 Mon Sep 17 00:00:00 2001 From: Isaac Schemm Date: Thu, 7 Jan 2021 13:08:39 -0600 Subject: [PATCH] Cleanup --- CrosspostSharp3/ArtworkForm.cs | 8 ++++++- .../FurryNetwork/FurryNetworkPostForm.cs | 2 +- CrosspostSharp3/Inkbunny/InkbunnyPostForm.cs | 3 ++- CrosspostSharp3/TextPost.cs | 17 +++++--------- CrosspostSharp3/Twitter/TwitterPostForm.cs | 2 +- CrosspostSharp3/Weasyl/WeasylPostForm.cs | 3 ++- CrosspostSharp3/WebRequestFactory.cs | 23 ------------------- 7 files changed, 19 insertions(+), 39 deletions(-) delete mode 100644 CrosspostSharp3/WebRequestFactory.cs diff --git a/CrosspostSharp3/ArtworkForm.cs b/CrosspostSharp3/ArtworkForm.cs index 71fbc8d..267c56c 100644 --- a/CrosspostSharp3/ArtworkForm.cs +++ b/CrosspostSharp3/ArtworkForm.cs @@ -16,6 +16,7 @@ using System.Drawing.Imaging; using System.IO; using System.Linq; +using System.Net; using System.Windows.Forms; namespace CrosspostSharp3 { @@ -75,7 +76,12 @@ public async void LoadImage(IPostBase artwork) { btnView.Enabled = _origWrapper.ViewURL != null; // Download image (if applicable) - _downloaded = await Downloader.DownloadAsync(_origWrapper); + try { + _downloaded = await Downloader.DownloadAsync(_origWrapper); + } catch (WebException ex) { + MessageBox.Show(this, ex.Message); + _downloaded = null; + } // Get photo (or thumbnail of video) if (_downloaded != null) { diff --git a/CrosspostSharp3/FurryNetwork/FurryNetworkPostForm.cs b/CrosspostSharp3/FurryNetwork/FurryNetworkPostForm.cs index a820e80..dd1d51e 100644 --- a/CrosspostSharp3/FurryNetwork/FurryNetworkPostForm.cs +++ b/CrosspostSharp3/FurryNetwork/FurryNetworkPostForm.cs @@ -60,7 +60,7 @@ private async void PopulateIcon() { var character = await _client.GetCharacterAsync(_characterName); string avatar = character.Avatars.Tiny ?? character.Avatars.GetLargest(); if (avatar != null) { - var req = WebRequestFactory.Create(avatar); + var req = WebRequest.Create(avatar); using (var resp = await req.GetResponseAsync()) using (var stream = resp.GetResponseStream()) using (var ms = new MemoryStream()) { diff --git a/CrosspostSharp3/Inkbunny/InkbunnyPostForm.cs b/CrosspostSharp3/Inkbunny/InkbunnyPostForm.cs index 01df392..213290e 100644 --- a/CrosspostSharp3/Inkbunny/InkbunnyPostForm.cs +++ b/CrosspostSharp3/Inkbunny/InkbunnyPostForm.cs @@ -5,6 +5,7 @@ using System.Drawing; using System.IO; using System.Linq; +using System.Net; using System.Windows.Forms; namespace CrosspostSharp3.Inkbunny { @@ -29,7 +30,7 @@ private async void Form_Shown(object sender, EventArgs e) { try { lblUsername1.Text = await _client.WhoamiAsync(); - var req = WebRequestFactory.Create(await _client.GetUserIconAsync()); + var req = WebRequest.Create(await _client.GetUserIconAsync()); using (var resp = await req.GetResponseAsync()) using (var stream = resp.GetResponseStream()) using (var ms = new MemoryStream()) { diff --git a/CrosspostSharp3/TextPost.cs b/CrosspostSharp3/TextPost.cs index cd904b6..2cb9197 100644 --- a/CrosspostSharp3/TextPost.cs +++ b/CrosspostSharp3/TextPost.cs @@ -1,21 +1,16 @@ using ArtworkSourceSpecification; using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace CrosspostSharp3 { - public class TextPost : IPostBase { - public string Title { get; set; } - public string HTMLDescription { get; set; } - public bool Mature { get; set; } - public bool Adult { get; set; } - public IEnumerable Tags { get; set; } + public record TextPost : IPostBase { + public string Title { get; init; } + public string HTMLDescription { get; init; } + public bool Mature { get; init; } + public bool Adult { get; init; } + public IEnumerable Tags { get; init; } DateTime IPostBase.Timestamp => DateTime.UtcNow; string IPostBase.ViewURL => null; - - public TextPost() { } } } diff --git a/CrosspostSharp3/Twitter/TwitterPostForm.cs b/CrosspostSharp3/Twitter/TwitterPostForm.cs index a7f6c90..9653e87 100644 --- a/CrosspostSharp3/Twitter/TwitterPostForm.cs +++ b/CrosspostSharp3/Twitter/TwitterPostForm.cs @@ -51,7 +51,7 @@ private async void TwitterPostForm_Shown(object sender, EventArgs e) { lblUsername1.Text = user.Name; lblUsername2.Text = "@" + user.ScreenName; - var req = WebRequestFactory.Create(user.ProfileImageUrl); + var req = WebRequest.Create(user.ProfileImageUrl); using (var resp = await req.GetResponseAsync()) using (var stream = resp.GetResponseStream()) using (var ms = new MemoryStream()) { diff --git a/CrosspostSharp3/Weasyl/WeasylPostForm.cs b/CrosspostSharp3/Weasyl/WeasylPostForm.cs index 005ccc2..0309d3d 100644 --- a/CrosspostSharp3/Weasyl/WeasylPostForm.cs +++ b/CrosspostSharp3/Weasyl/WeasylPostForm.cs @@ -4,6 +4,7 @@ using System.Drawing; using System.IO; using System.Linq; +using System.Net; using System.Windows.Forms; namespace CrosspostSharp3.Weasyl { @@ -46,7 +47,7 @@ private async void WeasylPostForm_Shown(object sender, EventArgs e) { var avatarUrl = await _apiClient.GetAvatarUrlAsync(user.login); - var req = WebRequestFactory.Create(avatarUrl); + var req = WebRequest.Create(avatarUrl); using (var resp = await req.GetResponseAsync()) using (var stream = resp.GetResponseStream()) using (var ms = new MemoryStream()) { diff --git a/CrosspostSharp3/WebRequestFactory.cs b/CrosspostSharp3/WebRequestFactory.cs deleted file mode 100644 index d211776..0000000 --- a/CrosspostSharp3/WebRequestFactory.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Text; -using System.Threading.Tasks; - -namespace CrosspostSharp3 { - public class WebRequestFactory { - public static WebRequest Create(string url) { - var req = WebRequest.Create(url ?? throw new ArgumentNullException(nameof(url))); - req.Method = "GET"; - if (req is HttpWebRequest httpreq) { - if (req.RequestUri.Host.EndsWith(".pximg.net")) { - httpreq.Referer = "https://app-api.pixiv.net/"; - } else { - httpreq.UserAgent = "CrosspostSharp/3.6 (https://github.com/libertyernie/CrosspostSharp)"; - } - } - return req; - } - } -}