mirrors/treebird
0
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Cleanup search results

Browse source 
FossilOrigin-Name: 034803e4aaf28b874c4aa534a9c4c0588ace59680262b95e538d9fb9b502d1f7
This commit is contained in:
nekobit 2022-05-21 20:23:26 +00:00
parent 8bad32ba99
commit 801b520579
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/search.c
View file

@ -99,6 +99,8 @@ void content_search_statuses(struct session* ssn, mastodont_t* api, char** data)
search_page(ssn, api, SEARCH_STATUSES, STR_NULL_EMPTY(statuses_html));
if (statuses_html) free(statuses_html);
mstdnt_cleanup_search_results(&results);
mastodont_storage_cleanup(&storage);
}
void content_search_accounts(struct session* ssn, mastodont_t* api, char** data)
@ -135,6 +137,8 @@ void content_search_accounts(struct session* ssn, mastodont_t* api, char** data)
search_page(ssn, api, SEARCH_ACCOUNTS, STR_NULL_EMPTY(accounts_html));
if (accounts_html) free(accounts_html);
mstdnt_cleanup_search_results(&results);
mastodont_storage_cleanup(&storage);
}
void content_search_hashtags(struct session* ssn, mastodont_t* api, char** data)
@ -185,9 +189,8 @@ void content_search_hashtags(struct session* ssn, mastodont_t* api, char** data)
search_page(ssn, api, SEARCH_HASHTAGS, tags_page);
if (tags_html) free(tags_html);
mastodont_storage_cleanup(&storage);
if (tags_graph) free(tags_graph);
free(tags_page);
// TODO Cleanup shit
mstdnt_cleanup_search_results(&results);
mastodont_storage_cleanup(&storage);
}

13
src/status.c
View file

@ -379,6 +379,7 @@ char* reformat_status(struct session* ssn,
struct mstdnt_emoji* emos,
size_t emos_len)
{
if (!content) return NULL;
char* gt_res = NULL;
char* emo_res;
if (ssn->config.stat_greentexts)
@ -527,14 +528,15 @@ char* construct_status(struct session* ssn,
interaction_btns = construct_interaction_buttons(ssn, status, NULL, flags);
// Find and replace
if (args && args->highlight_word)
if (args && args->highlight_word && parse_content != status->content)
{
char* parse_content_tmp;
char* repl_str;
easprintf(&repl_str, "<span class=\"search-highlight\">%s</span>", args->highlight_word);
parse_content_tmp = parse_content;
parse_content = strrepl(parse_content, args->highlight_word, repl_str, STRREPL_ALL);
if (parse_content != parse_content_tmp)
// Check if the old parse_content needed to be free'd
if (parse_content_tmp != status->content)
free(parse_content_tmp);
else // No results, move back
parse_content = parse_content_tmp;
@ -590,15 +592,16 @@ char* construct_status(struct session* ssn,
if (size) *size = s;
// Cleanup
if (formatted_display_name != status->account.display_name) free(formatted_display_name);
if (formatted_display_name != status->account.display_name &&
formatted_display_name) free(formatted_display_name);
if (interaction_btns) free(interaction_btns);
if (in_reply_to_str) free(in_reply_to_str);
if (attachments) free(attachments);
if (emoji_reactions) free(emoji_reactions);
if (notif) free(notif_info);
if (interactions_html) free(interactions_html);
//if (formatted_display_name != status->account.display_name) free(formatted_display_name);
if (parse_content != status->content) free(parse_content);
if (parse_content != status->content &&
parse_content) free(parse_content);
return stat_html;
}