Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only remove Twitter image URLs, not 3rd party media URLs #612

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Only remove Twitter image URLs, not 3rd party media URLs #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/MediaDownloader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,21 @@ is_media_candidate (const char *url)

}

gboolean
is_twitter_media_candidate (const char *url)
{
url = canonicalize_url (url);

return
#ifdef VIDEO
g_str_has_prefix (url, "/photo/1/") ||
g_str_has_prefix (url, "video.twimg.com/ext_tw_video") ||
#endif
g_str_has_prefix (url, "pbs.twimg.com/media/")
;

}

static void
cb_media_downloader_init (CbMediaDownloader *downloader)
{
Expand Down
1 change: 1 addition & 0 deletions src/MediaDownloader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ void cb_media_downloader_disable (CbMediaDownloader *downloader);

gboolean is_media_candidate (const char *url);

gboolean is_twitter_media_candidate (const char *url);

G_END_DECLS

Expand Down
2 changes: 1 addition & 1 deletion src/TextTransform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ is_media_url (const char *url,
const char *display_text,
gsize media_count)
{
return (is_media_candidate (url != NULL ? url : display_text) && media_count == 1) ||
return (is_twitter_media_candidate (url != NULL ? url : display_text) && media_count == 1) ||
g_str_has_prefix (display_text, "pic.twitter.com/");
}

Expand Down
28 changes: 18 additions & 10 deletions src/Types.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,16 +364,6 @@ cb_mini_tweet_parse_entities (CbMiniTweet *t,
JsonObject *url = json_node_get_object (json_array_get_element (urls, i));
const char *expanded_url = json_object_get_string_member (url, "expanded_url");
JsonArray *indices;

if (is_media_candidate (expanded_url))
{
t->medias[t->n_medias] = cb_media_new ();
t->medias[t->n_medias]->url = g_strdup (expanded_url);
t->medias[t->n_medias]->type = cb_media_type_from_url (expanded_url);
t->medias[t->n_medias]->target_url = g_strdup (expanded_url);
t->n_medias ++;
}

indices = json_object_get_array_member (url, "indices");
t->entities[url_index].from = json_array_get_int_element (indices, 0);
t->entities[url_index].to = json_array_get_int_element (indices, 1);
Expand Down Expand Up @@ -580,6 +570,24 @@ cb_mini_tweet_parse_entities (CbMiniTweet *t,
}
}

if (t->n_medias == 0)
{
for (i = 0, p = json_array_get_length (urls); i < p; i ++)
{
JsonObject *url = json_node_get_object (json_array_get_element (urls, i));
const char *expanded_url = json_object_get_string_member (url, "expanded_url");

if (is_media_candidate (expanded_url))
{
t->medias[t->n_medias] = cb_media_new ();
t->medias[t->n_medias]->url = g_strdup (expanded_url);
t->medias[t->n_medias]->type = cb_media_type_from_url (expanded_url);
t->medias[t->n_medias]->target_url = g_strdup (expanded_url);
t->n_medias ++;
}
}
}

t->n_entities = url_index;
#if 0
g_debug ("Wasted entities: %d", max_entities - t->n_entities);
Expand Down