DevComp/fxtwitter-docker
1
0
Fork 0
mirror of https://github.com/CompeyDev/fxtwitter-docker.git synced 2025-04-05 10:30:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix note tweets urls

Browse source
This commit is contained in:
dangered wolf 2023-08-21 21:12:41 -04:00
parent 202472fa34
commit 49413d5e49
No known key found for this signature in database
GPG key ID: 41E4D37680ED8B58
2 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/api/status.ts
View file

@ -84,6 +84,20 @@ const populateTweetProperties = async (
} else { } else {
apiTweet.views = null; apiTweet.views = null;
} }
console.log('note_tweet', JSON.stringify(tweet.note_tweet));
const noteTweetText = tweet.note_tweet?.note_tweet_results?.result?.text;
/* For now, don't include note tweets */
if (noteTweetText) {
tweet.legacy.entities.urls = tweet.note_tweet?.note_tweet_results?.result?.entity_set.urls;
tweet.legacy.entities.hashtags = tweet.note_tweet?.note_tweet_results?.result?.entity_set.hashtags;
tweet.legacy.entities.symbols = tweet.note_tweet?.note_tweet_results?.result?.entity_set.symbols;
console.log('We meet the conditions to use new note tweets');
apiTweet.text = unescapeText(linkFixer(tweet, noteTweetText));
apiTweet.is_note_tweet = true;
} else {
apiTweet.is_note_tweet = false;
}
if (tweet.legacy.lang !== 'unk') { if (tweet.legacy.lang !== 'unk') {
apiTweet.lang = tweet.legacy.lang; apiTweet.lang = tweet.legacy.lang;
@ -126,18 +140,6 @@ const populateTweetProperties = async (
apiTweet.color = colorFromPalette(mediaList[0].ext_media_color.palette); apiTweet.color = colorFromPalette(mediaList[0].ext_media_color.palette);
} }
*/ */
console.log('note_tweet', JSON.stringify(tweet.note_tweet));
const noteTweetText = tweet.note_tweet?.note_tweet_results?.result?.text;
/* For now, don't include note tweets */
if (
noteTweetText /*&& mediaList.length <= 0 && tweet.legacy.entities?.urls?.length <= 0*/
) {
console.log('We meet the conditions to use new note tweets');
apiTweet.text = unescapeText(linkFixer(tweet, noteTweetText));
apiTweet.is_note_tweet = true;
} else {
apiTweet.is_note_tweet = false;
}
/* Handle photos and mosaic if available */ /* Handle photos and mosaic if available */
if ((apiTweet?.media?.photos?.length || 0) > 1) { if ((apiTweet?.media?.photos?.length || 0) > 1) {

21
src/types/twitterTypes.d.ts vendored
View file

@ -390,13 +390,24 @@ type GraphQLTweet = {
legacy: GraphQLTweetLegacy; legacy: GraphQLTweetLegacy;
note_tweet: { note_tweet: {
is_expandable: boolean; is_expandable: boolean;
entity_set: {
hashtags: unknown[];
urls: unknown[];
user_mentions: unknown[];
};
note_tweet_results: { note_tweet_results: {
result: { result: {
entity_set: {
hashtags: unknown[];
symbols: unknown[];
urls: TcoExpansion[];
user_mentions: unknown[];
};
media: {
inline_media: unknown[]
};
richtext: {
richtext_tags: {
from_index: number
to_index: number
richtext_types: string[]
}[]
};
text: string; text: string;
}; };
}; };