Merge pull request #108 from 0xBADDCAFE/main

Trivial fix
supermomonga · Jul 7, 2023 · 1849fe9 · 1849fe9
2 parents f5ff267 + 6edda41
commit 1849fe9
Show file tree

Hide file tree

Showing 19 changed files with 30 additions and 30 deletions.
diff --git a/MoEmbed.Core.Tests/Models/Metadata/TwitterMetadataTest.cs b/MoEmbed.Core.Tests/Models/Metadata/TwitterMetadataTest.cs
@@ -11,7 +11,7 @@ public class TwitterExperimentalMetadataTest
         [Theory]
         [InlineData(
             463440424141459456L,
-            "US Department of the Interior",
+            "US Department of the Interior (@Interior)",
             "https://pbs.twimg.com/profile_images/432081479/DOI_LOGO_normal.jpg",
             "Sunsets don't get much better than this one over @GrandTetonNPS. #nature #sunset http://t.co/YuKy2rcjyU"
             )]

diff --git a/MoEmbed.Core/Models/Metadata/TwitterExperimentalMetadata.cs b/MoEmbed.Core/Models/Metadata/TwitterExperimentalMetadata.cs
@@ -1,4 +1,4 @@
-using MoEmbed.Models.TweetExperimental;
+using MoEmbed.Models.TwitterExperimental;
 
 using Portable.Xaml.Markup;
 
@@ -46,6 +46,16 @@ public override async Task<EmbedData> FetchAsync(RequestContext context)
             req.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
             var res = await context.Service.HttpClient.SendAsync(req).ConfigureAwait(false);
 
+            if (res.StatusCode == System.Net.HttpStatusCode.NotFound)
+            {
+                return new EmbedData()
+                {
+                    Url = Url,
+                    Title = "Not found",
+                    Description = "Sorry, we can't create an embed for that. It may have been deleted or made private. Please try again.",
+                };
+            }
+
             res.EnsureSuccessStatusCode();
 
             var tweet = JsonSerializer.Deserialize<Tweet>(res.Content.ReadAsStream(), new JsonSerializerOptions { Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping });
@@ -65,7 +75,7 @@ public override async Task<EmbedData> FetchAsync(RequestContext context)
                     Location = Url,
                     RestrictionPolicy = RestrictionPolicies.Safe
                 },
-                Title = tweet.User.Name,
+                Title = $"{tweet.User.Name} (@{tweet.User.ScreenName})",
                 Description = tweet.Text,
                 Medias = tweet.MediaDetails?.Select(ToMedia).ToList() ?? new(),
                 RestrictionPolicy = tweet.PossiblySensitive ? RestrictionPolicies.Restricted : RestrictionPolicies.Safe,

diff --git a/MoEmbed.Core/Models/TwitterExperimental/BackgroundColor.cs b/MoEmbed.Core/Models/TwitterExperimental/BackgroundColor.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace MoEmbed.Models.TweetExperimental
+namespace MoEmbed.Models.TwitterExperimental
 {
     public class BackgroundColor
     {

diff --git a/MoEmbed.Core/Models/TwitterExperimental/EditControl.cs b/MoEmbed.Core/Models/TwitterExperimental/EditControl.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace MoEmbed.Models.TweetExperimental
+namespace MoEmbed.Models.TwitterExperimental
 {
     public class EditControl
     {

diff --git a/MoEmbed.Core/Models/TwitterExperimental/Entities.cs b/MoEmbed.Core/Models/TwitterExperimental/Entities.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace MoEmbed.Models.TweetExperimental
+namespace MoEmbed.Models.TwitterExperimental
 {
     public class Entities
     {

diff --git a/MoEmbed.Core/Models/TwitterExperimental/ExtMediaAvailability.cs b/MoEmbed.Core/Models/TwitterExperimental/ExtMediaAvailability.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace MoEmbed.Models.TweetExperimental
+namespace MoEmbed.Models.TwitterExperimental
 {
     public class ExtMediaAvailability
     {

diff --git a/MoEmbed.Core/Models/TwitterExperimental/Hashtag.cs b/MoEmbed.Core/Models/TwitterExperimental/Hashtag.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace MoEmbed.Models.TweetExperimental
+namespace MoEmbed.Models.TwitterExperimental
 {
     public class Hashtag
     {

diff --git a/MoEmbed.Core/Models/TwitterExperimental/Large.cs b/MoEmbed.Core/Models/TwitterExperimental/Large.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace MoEmbed.Models.TweetExperimental
+namespace MoEmbed.Models.TwitterExperimental
 {
     public class Large
     {

diff --git a/MoEmbed.Core/Models/TwitterExperimental/Media.cs b/MoEmbed.Core/Models/TwitterExperimental/Media.cs
@@ -1,8 +1,7 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-// Tweet myDeserializedClass = JsonConvert.DeserializeObject<Tweet>(myJsonResponse);
-namespace MoEmbed.Models.TweetExperimental
+namespace MoEmbed.Models.TwitterExperimental
 {
     public class Media
     {

diff --git a/MoEmbed.Core/Models/TwitterExperimental/MediaDetail.cs b/MoEmbed.Core/Models/TwitterExperimental/MediaDetail.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace MoEmbed.Models.TweetExperimental
+namespace MoEmbed.Models.TwitterExperimental
 {
     public class MediaDetail
     {

diff --git a/MoEmbed.Core/Models/TwitterExperimental/Medium.cs b/MoEmbed.Core/Models/TwitterExperimental/Medium.cs
@@ -1,7 +1,6 @@
 using System.Text.Json.Serialization;
 
-// Tweet myDeserializedClass = JsonConvert.DeserializeObject<Tweet>(myJsonResponse);
-namespace MoEmbed.Models.TweetExperimental
+namespace MoEmbed.Models.TwitterExperimental
 {
     public class Medium
     {

diff --git a/MoEmbed.Core/Models/TwitterExperimental/OriginalInfo.cs b/MoEmbed.Core/Models/TwitterExperimental/OriginalInfo.cs
@@ -1,7 +1,6 @@
 using System.Text.Json.Serialization;
 
-// Tweet myDeserializedClass = JsonConvert.DeserializeObject<Tweet>(myJsonResponse);
-namespace MoEmbed.Models.TweetExperimental
+namespace MoEmbed.Models.TwitterExperimental
 {
     public class OriginalInfo
     {

diff --git a/MoEmbed.Core/Models/TwitterExperimental/Photo.cs b/MoEmbed.Core/Models/TwitterExperimental/Photo.cs
@@ -1,8 +1,7 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-// Tweet myDeserializedClass = JsonConvert.DeserializeObject<Tweet>(myJsonResponse);
-namespace MoEmbed.Models.TweetExperimental
+namespace MoEmbed.Models.TwitterExperimental
 {
     public class Photo
     {

diff --git a/MoEmbed.Core/Models/TwitterExperimental/Sizes.cs b/MoEmbed.Core/Models/TwitterExperimental/Sizes.cs
@@ -1,7 +1,6 @@
 using System.Text.Json.Serialization;
 
-// Tweet myDeserializedClass = JsonConvert.DeserializeObject<Tweet>(myJsonResponse);
-namespace MoEmbed.Models.TweetExperimental
+namespace MoEmbed.Models.TwitterExperimental
 {
     public class Sizes
     {

diff --git a/MoEmbed.Core/Models/TwitterExperimental/Small.cs b/MoEmbed.Core/Models/TwitterExperimental/Small.cs
@@ -1,7 +1,6 @@
 using System.Text.Json.Serialization;
 
-// Tweet myDeserializedClass = JsonConvert.DeserializeObject<Tweet>(myJsonResponse);
-namespace MoEmbed.Models.TweetExperimental
+namespace MoEmbed.Models.TwitterExperimental
 {
     public class Small
     {

diff --git a/MoEmbed.Core/Models/TwitterExperimental/Thumb.cs b/MoEmbed.Core/Models/TwitterExperimental/Thumb.cs
@@ -1,7 +1,6 @@
 using System.Text.Json.Serialization;
 
-// Tweet myDeserializedClass = JsonConvert.DeserializeObject<Tweet>(myJsonResponse);
-namespace MoEmbed.Models.TweetExperimental
+namespace MoEmbed.Models.TwitterExperimental
 {
     public class Thumb
     {

diff --git a/MoEmbed.Core/Models/TwitterExperimental/Tweet.cs b/MoEmbed.Core/Models/TwitterExperimental/Tweet.cs
@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-// Tweet myDeserializedClass = JsonConvert.DeserializeObject<Tweet>(myJsonResponse);
-namespace MoEmbed.Models.TweetExperimental
+namespace MoEmbed.Models.TwitterExperimental
 {
     public class Tweet
     {

diff --git a/MoEmbed.Core/Models/TwitterExperimental/User.cs b/MoEmbed.Core/Models/TwitterExperimental/User.cs
@@ -1,7 +1,6 @@
 using System.Text.Json.Serialization;
 
-// Tweet myDeserializedClass = JsonConvert.DeserializeObject<Tweet>(myJsonResponse);
-namespace MoEmbed.Models.TweetExperimental
+namespace MoEmbed.Models.TwitterExperimental
 {
     public class User
     {

diff --git a/MoEmbed.Core/Models/TwitterExperimental/UserMention.cs b/MoEmbed.Core/Models/TwitterExperimental/UserMention.cs
@@ -1,8 +1,7 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-// Tweet myDeserializedClass = JsonConvert.DeserializeObject<Tweet>(myJsonResponse);
-namespace MoEmbed.Models.TweetExperimental
+namespace MoEmbed.Models.TwitterExperimental
 {
     public class UserMention
     {