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

Separate account code for not just statuses

Browse source 
FossilOrigin-Name: 8f2dea4a3f268b9b49cd956901a4aee7697cb6fc2621a813e94de063d2be7864
This commit is contained in:
me@ow.nekobit.net 2022-04-14 01:07:13 +00:00
parent 17228ed2f2
commit e8e765ed81
7 changed files with 50 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/account.c
View file

@ -32,6 +32,7 @@
#include "../static/account_info.chtml"
#define FOLLOWS_YOU_HTML "<span class=\"acct-badge\">%s</span>"
#define MAKE_FOCUSED_IF(test_tab) (tab == test_tab ? "focused" : "")
char* construct_account_info(struct mstdnt_account* acct,
size_t* size)
@ -49,25 +50,18 @@ char* construct_account_info(struct mstdnt_account* acct,
char* construct_account_page(mastodont_t* api,
struct mstdnt_account* acct,
struct mstdnt_relationship* relationship,
struct mstdnt_status* statuses,
size_t statuses_len,
enum account_tab tab,
char* content,
size_t* res_size)
{
int cleanup = 0;
int result_size;
char* statuses_html;
char* follows_you = NULL;
char* info_html = NULL;
char* is_blocked = NULL;
char* result;
// Load statuses html
statuses_html = construct_statuses(api, statuses, statuses_len, NULL);
if (!statuses_html)
statuses_html = "Error in malloc!";
else
cleanup = 1;
if (acct->note && strcmp(acct->note, "") != 0)
{
info_html = construct_account_info(acct, NULL);
@ -79,7 +73,7 @@ char* construct_account_page(mastodont_t* api,
easprintf(&follows_you, FOLLOWS_YOU_HTML, "Follows you");
if (MSTDNT_FLAG_ISSET(relationship->flags, MSTDNT_RELATIONSHIP_BLOCKED_BY))
is_blocked = construct_error("You are blocked by this user", E_NOTE, 0, NULL);
is_blocked = construct_error("You are blocked by this user", E_NOTICE, 0, NULL);
}
result_size = easprintf(&result, data_account_html,
@ -112,59 +106,69 @@ char* construct_account_page(mastodont_t* api,
info_html ? info_html : "",
config_url_prefix,
acct->acct,
MAKE_FOCUSED_IF(ACCT_TAB_STATUSES),
"Statuses",
config_url_prefix,
acct->acct,
MAKE_FOCUSED_IF(ACCT_TAB_SCROBBLES),
"Scrobbles",
config_url_prefix,
acct->acct,
MAKE_FOCUSED_IF(ACCT_TAB_MEDIA),
"Media",
config_url_prefix,
acct->acct,
MAKE_FOCUSED_IF(ACCT_TAB_PINNED),
"Pinned",
statuses_html);
content);
if (result_size == -1)
result = NULL;
if (res_size) *res_size = result_size;
if (cleanup) free(statuses_html);
if (info_html) free(info_html);
if (follows_you) free(follows_you);
if (is_blocked) free(is_blocked);
return result;
}
void content_account(struct session* ssn, mastodont_t* api, char** data)
void content_account_statuses(struct session* ssn, mastodont_t* api, char** data)
{
char* account_page;
struct mstdnt_account acct = { 0 };
struct mstdnt_storage storage = { 0 }, status_storage = { 0 }, relations_storage = { 0 };
struct mstdnt_status* statuses = NULL;
struct mstdnt_relationship* relationships = { 0 };
size_t status_len = 0;
size_t statuses_len = 0;
char* statuses_html = NULL;
size_t relationships_len = 0;
int lookup_type = config_experimental_lookup ? MSTDNT_LOOKUP_ACCT : MSTDNT_LOOKUP_ID;
if (mastodont_get_account(api, lookup_type, data[0],
&acct, &storage, NULL) ||
mastodont_get_account_statuses(api, acct.id, NULL,
&status_storage, &statuses, &status_len))
&status_storage, &statuses, &statuses_len))
{
account_page = construct_error(status_storage.error, E_ERROR, 1, NULL);
}
else {
/* Not an error? */
mastodont_get_relationships(api, &(acct.id), 1, &relations_storage, &relationships, &relationships_len);
// Create statuses HTML
statuses_html = construct_statuses(api, statuses, statuses_len, NULL);
if (!statuses_html)
statuses_html = construct_error("No statuses", E_NOTICE, 1, NULL);
account_page = construct_account_page(api,
&acct,
relationships,
statuses,
status_len,
ACCT_TAB_STATUSES,
statuses_html,
NULL);
if (!account_page)
exit(EXIT_FAILURE);
}
struct base_page b = {
@ -177,14 +181,13 @@ void content_account(struct session* ssn, mastodont_t* api, char** data)
/* Output */
render_base_page(&b, ssn, api);
/* TODO urgent: cleanup relationships */
/* Cleanup */
mastodont_storage_cleanup(&storage);
mastodont_storage_cleanup(&status_storage);
mastodont_storage_cleanup(&relations_storage);
mstdnt_cleanup_statuses(statuses, status_len);
mstdnt_cleanup_statuses(statuses, statuses_len);
mstdnt_cleanup_relationships(relationships);
free(statuses_html);
free(account_page);
}

20
src/account.h
View file

@ -22,15 +22,25 @@
#include <mastodont.h>
#include "session.h"
char* construct_account_info(struct mstdnt_account* acct,
size_t* size);
enum account_tab
{
ACCT_TAB_STATUSES,
ACCT_TAB_SCROBBLES,
ACCT_TAB_PINNED,
ACCT_TAB_MEDIA
};
char* construct_account_page(mastodont_t* api,
struct mstdnt_account* acct,
struct mstdnt_relationship* relationship,
struct mstdnt_status* statuses,
size_t statuses_len,
enum account_tab tab,
char* content,
size_t* res_size);
void content_account(struct session* ssn, mastodont_t* api, char** data);
char* construct_account_info(struct mstdnt_account* acct,
size_t* size);
void content_account_statuses(struct session* ssn, mastodont_t* api, char** data);
void content_account_action(struct session* ssn, mastodont_t* api, char** data);
#endif // ACCOUNT_H

2
src/error.c
View file

@ -36,7 +36,7 @@ char* construct_error(char* error, enum error_type type, unsigned pad, size_t* s
class = "error"; break;
case E_WARNING:
class = "warning"; break;
case E_NOTE:
case E_NOTICE:
class = "notice"; break;
}
size_t s = easprintf(&error_html, data_error_html,

2
src/error.h
View file

@ -26,7 +26,7 @@ enum error_type
{
E_ERROR,
E_WARNING,
E_NOTE
E_NOTICE
};
char* construct_error(char* error, enum error_type type, unsigned pad, size_t* size);

5
src/main.c
View file

@ -86,7 +86,10 @@ int main(void)
{ "/test", content_test },
{ "/user/:/action/:", content_account_action },
{ "/search", content_search },
{ "/@:", content_account },
{ "/@:", content_account_statuses },
/* { "/@:/scrobbles", content_account_scrobbles }, */
/* { "/@:/pinned", content_account_pinned }, */
/* { "/@:/media", content_account_media }, */
{ "/status/create", content_status_create },
{ "/status/:/interact", status_interact },
{ "/status/:/reply", status_reply },

2
src/notifications.c
View file

@ -185,7 +185,7 @@ void content_notifications(struct session* ssn, mastodont_t* api, char** data)
mstdnt_cleanup_notifications(notifs, notifs_len);
}
else
notif_html = construct_error(storage.error, E_NOTE, 1, NULL);
notif_html = construct_error(storage.error, E_NOTICE, 1, NULL);
}

8
static/account.html
View file

@ -47,16 +47,16 @@
<table class="tabs ui-table">
<tr>
<td>
<a href="%s/@%s/statuses"><input class="tab-btn btn focused" type="button" value="%s"></a>
<a href="%s/@%s/statuses"><input class="tab-btn btn %s" type="button" value="%s"></a>
</td>
<td>
<a href="%s/@%s/scrobbles"><input class="tab-btn btn" type="button" value="%s"></a>
<a href="%s/@%s/scrobbles"><input class="tab-btn btn %s" type="button" value="%s"></a>
</td>
<td>
<a href="%s/@%s/media"><input class="tab-btn btn" type="button" value="%s"></a>
<a href="%s/@%s/media"><input class="tab-btn btn %s" type="button" value="%s"></a>
</td>
<td>
<a href="%s/@%s/pinned"><input class="tab-btn btn" type="button" value="%s"></a>
<a href="%s/@%s/pinned"><input class="tab-btn btn %s" type="button" value="%s"></a>
</td>
</tr>
</table>