From 3cf3f95ccba26a2de11555b41a934d424f72c6ec Mon Sep 17 00:00:00 2001 From: Miss Pasture Date: Sat, 17 Jul 2021 19:05:10 -0400 Subject: [PATCH] Mark Tweets that are reported as potentially sensitive with as:sensitive --- src/BirdsiteLive.Domain/StatusService.cs | 4 ++-- src/BirdsiteLive.Twitter/Extractors/TweetExtractor.cs | 4 +++- src/BirdsiteLive.Twitter/Models/ExtractedTweet.cs | 1 + src/BirdsiteLive.Twitter/Models/TwitterUser.cs | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/BirdsiteLive.Domain/StatusService.cs b/src/BirdsiteLive.Domain/StatusService.cs index e901db8..0fc211d 100644 --- a/src/BirdsiteLive.Domain/StatusService.cs +++ b/src/BirdsiteLive.Domain/StatusService.cs @@ -81,10 +81,10 @@ namespace BirdsiteLive.Domain to = new[] { to }, cc = cc, - sensitive = false, + sensitive = tweet.IsSensitive, content = $"

{content}

", attachment = Convert(tweet.Media), - tag = extractedTags.tags + tag = extractedTags.tags, }; return note; diff --git a/src/BirdsiteLive.Twitter/Extractors/TweetExtractor.cs b/src/BirdsiteLive.Twitter/Extractors/TweetExtractor.cs index d8c488f..0cd1e34 100644 --- a/src/BirdsiteLive.Twitter/Extractors/TweetExtractor.cs +++ b/src/BirdsiteLive.Twitter/Extractors/TweetExtractor.cs @@ -38,7 +38,8 @@ namespace BirdsiteLive.Twitter.Extractors IsReply = tweet.InReplyToUserId != null, IsThread = tweet.InReplyToUserId != null && tweet.InReplyToUserId == tweet.CreatedBy.Id, IsRetweet = tweet.IsRetweet || tweet.QuotedStatusId != null, - RetweetUrl = ExtractRetweetUrl(tweet) + RetweetUrl = ExtractRetweetUrl(tweet), + IsSensitive = tweet.PossiblySensitive }; return extractedTweet; @@ -125,6 +126,7 @@ namespace BirdsiteLive.Twitter.Extractors var mediaType = GetMediaType(m.MediaType, mediaUrl); if (mediaType == null) continue; + var att = new ExtractedMedia { MediaType = mediaType, diff --git a/src/BirdsiteLive.Twitter/Models/ExtractedTweet.cs b/src/BirdsiteLive.Twitter/Models/ExtractedTweet.cs index f7f4e59..f89ea4a 100644 --- a/src/BirdsiteLive.Twitter/Models/ExtractedTweet.cs +++ b/src/BirdsiteLive.Twitter/Models/ExtractedTweet.cs @@ -15,5 +15,6 @@ namespace BirdsiteLive.Twitter.Models public bool IsThread { get; set; } public bool IsRetweet { get; set; } public string RetweetUrl { get; set; } + public bool IsSensitive { get; set; } } } \ No newline at end of file diff --git a/src/BirdsiteLive.Twitter/Models/TwitterUser.cs b/src/BirdsiteLive.Twitter/Models/TwitterUser.cs index 0403366..b41a2ae 100644 --- a/src/BirdsiteLive.Twitter/Models/TwitterUser.cs +++ b/src/BirdsiteLive.Twitter/Models/TwitterUser.cs @@ -11,5 +11,6 @@ public string Acct { get; set; } public string ProfileBannerURL { get; set; } public bool Protected { get; set; } + public bool Sensitive { get; set; } } } \ No newline at end of file