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

Splash text; fix building (!!!); fix install subcommand 

FossilOrigin-Name: f2231a6e284132794d0a83ba94466329f0fb98a7098b7bd78fe3f33144504f80
This commit is contained in:
nekobit 2023-04-02 06:13:54 +00:00
parent 33fcc22d3c
commit 82522a99b3
6 changed files with 136 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
docs/INSTALL.md
View File

@ -1,18 +1,16 @@
# Installing Treebird
This is a stub and isn't complete, please update it!
## Compiling
For the following GNU/Linux distributions, you will need the following libraries/packages:
For the following UNIX-like system, you will need the following libraries/packages:
###### Debian
`# apt install libcurl4-gnutls-dev libpcre2-dev libfcgi-dev build-essential perl libperl-dev libtemplate-perl`
`# apt install libcurl4-gnutls-dev libfcgi-dev build-essential perl libperl-dev libtemplate-perl`
###### Void GNU/Linux
`# xbps-install libcurl libcurl-devel base-devel pcre2 pcre2-devel fcgi fcgi-devel perl-Template-Toolkit`
`# xbps-install libcurl libcurl-devel base-devel fcgi fcgi-devel perl-Template-Toolkit`
###### Arch
@ -22,11 +20,20 @@ For the following GNU/Linux distributions, you will need the following libraries
TODO
###### FreeBSD
`# pkg install p5-Template-Toolkit fcgi-devkit curl gmake`
Install mastodont-c. `fossil clone https://code.nekobit.net/fossil/mastodont-c`,
`premake4 gmake`, `make`, `make install`.
Create a copy of `config.def.h` at `config.h`, edit the file with your information
(Premake will remind you of this). Note that this setup will change in the
future.
Run `make`. (**hint:** Pass -j3 to speed up compilation). This will also clone mastodont-c, and compile both it and Treebird.
Run `premake4 gmake`. This will generate a gmake build file.
If you `fossil update` any changes, `make update` should be run after updating
Then run `make`. (**hint:** Pass -j3 to speed up compilation).
## Perl dependencies manual install
@ -53,7 +60,7 @@ Run `# make install`
If this succeeds (assuming you used default variables), you can now find Treebird at the following
- `/usr/local/share/treebird/` - Contains CSS, images, and other meta files
- `/usr/local/share/treebird/` - Contains CSS, images, perl, and other meta files
- `/usr/local/bin/treebird` - Regular executable CGI file, test it by running it as is, it shouldn't spit anything out
## Development

3
premake4.lua
View File

@ -113,6 +113,7 @@ newaction {
execute = function()
os.copyfile("treebird", prefix .. "/bin");
os.mkdir(prefix .. "/share/treebird");
os.execute("install -d dist/ " .. prefix .. "/share/treebird");
os.execute("cp -r dist/ " .. prefix .. "/share/treebird/dist/");
os.execute("cp -r perl/ " .. prefix .. "/share/treebird/perl/");
end
}

44
src/helpers.c
View File

@ -4,6 +4,50 @@
* Licensed under the BSD 3-Clause License
*/
#include <stdio.h>
void
print_treebird_logo(void)
{
printf(" ...----'''''----...\n"
" ''''' '''''\n"
" ,,'''' '''',\n"
" ,,''' ''',,\n"
" ,,'' '',,\n"
" ,'' '',\n"
" ,,' .;clll:,. ',,\n"
" ,'' .:xkkkxoodo;. '',\n"
" '' 'dkkkxxooxkc. ',\n"
" '' .okkkkkkkkkxoolc:'. ''\n"
" '' .:oxkkkkkkkkkkkkxo:'. ''\n"
"'' .okkkkkkkkkkkkkkkxdc;.. ''\n"
";' .okkkkkkkkkkkkkkkkkkkd:. ';\n"
"; ;dkkkkkkkkkkkxdxkkkkxdc. ;\n"
"; .,:ldkkxdoodl;,:oxkkxl. ;\n"
"; .colc:'. .,cc. ,oc....;d:. ..,;'. ;\n"
"; .dxc;cdo,,oxdxc. .c:. .;c,. .... ;\n"
";' .lxc. ,dxxkddx:. ...',;;;;:odl;;:ldl;,,,;;;,,'... ';\n"
"-' .:doccdxodkkxolodxxkkkkkkkxxxdooolcc::;,'.. '-\n"
" '' .,ldkxddkkkkkkkkkxol:;,,..... ;'\n"
" '' .':oxkkkkkkkkxdl;'.. '''\n"
" '''cdxkkkkkkkkxl:'. '''\n"
" ''kkkkkkkxl;. :''\n"
" '''kkkd:. .''\n"
" ''':. .'''\n"
" ''' ''''\n"
" '''' ''''\n"
" '''''. .':''''\n"
" ''''',..________..,'''''\n"
" _____ _ '' _ _____ _____\n"
" |_ _| __ ___ ___| |__ (_)_ __ __| | | ___| ____|\n"
" | || '__/ _ \\/ _ \\ '_ \\| | '__/ _` | | |_ | _|\n"
" | || | | __/ __/ |_) | | | | (_| | | _| | |___\n"
" |_||_| \\___|\\___|_.__/|_|_| \\__,_| |_| |_____|\n\n"
" Thank you for trying this software!\n"
" To use it, it must be 'deployed' with an FCGI daemon.\n"
" Press ^C to quit.\n");
}
#include "../config.h"
#include "helpers.h"

1
src/helpers.h
View File

@ -10,5 +10,6 @@
#include "session.h"
void set_mstdnt_args(struct mstdnt_args* args, struct session* ssn);
void print_treebird_logo();
#endif /* HELPERS_H */

9
src/main.c
View File

@ -284,12 +284,21 @@ void xs_init(pTHX)
int main(int argc, char **argv, char **env)
{
#ifndef NO_EASTER_EGG
if (getenv("TERM"))
{
print_treebird_logo();
}
#endif
// Global init
mstdnt_global_curl_init();
#ifndef CGI_MODE
FCGX_Init();
#endif
// Initialize Perl
PERL_SYS_INIT3(&argc, &argv, &env);
my_perl = perl_alloc();

117
src/status.c
View File

@ -23,6 +23,7 @@
#include "../config.h"
#include "string.h"
#include "emoji.h"
#include "types.h"
#include "account.h"
#define ACCOUNT_INTERACTIONS_LIMIT 11
@ -30,6 +31,7 @@
int try_post_status(struct session* ssn, mastodont_t* api)
{
#if 0
if (!(keystr(ssn->post.content))) return 1;
struct mstdnt_args m_args;
set_mstdnt_args(&m_args, ssn);
@ -39,8 +41,6 @@ int try_post_status(struct session* ssn, mastodont_t* api)
// a MIME post request
m_args.flags ^= MSTDNT_FLAG_NO_URI_SANITIZE;
struct mstdnt_storage storage = { 0 }, *att_storage = NULL;
char** files = NULL;
size_t files_len = 0;
struct mstdnt_attachment* attachments = NULL;
@ -50,9 +50,11 @@ int try_post_status(struct session* ssn, mastodont_t* api)
// Upload images
if (!ssn->post.file_ids.is_set)
try_upload_media(&att_storage, ssn, api, &attachments, &media_ids);
else
{
try_upload_media(&att_storage, ssn, api, &attachments, &media_ids);
return 1;
}
else {
// Parse json file ids
json_ids = cJSON_Parse(keystr(ssn->post.file_ids));
json_ids_len = cJSON_GetArraySize(json_ids);
@ -90,7 +92,7 @@ int try_post_status(struct session* ssn, mastodont_t* api)
};
// Finally, create (no error checking)
mstdnt_create_status(api, &m_args, NULL, NULL, &args, &storage);
mstdnt_create_status(api, &m_args, NULL, NULL, args);
mstdnt_storage_cleanup(&storage);
@ -104,6 +106,7 @@ int try_post_status(struct session* ssn, mastodont_t* api)
tb_free(attachments);
if (json_ids) cJSON_Delete(json_ids);
#endif
return 0;
}
@ -111,13 +114,9 @@ int try_react_status(struct session* ssn, mastodont_t* api, char* id, char* emoj
{
struct mstdnt_args m_args;
set_mstdnt_args(&m_args, ssn);
struct mstdnt_storage storage = { 0 };
struct mstdnt_status status = { 0 };
mstdnt_status_emoji_react(api, &m_args, NULL, NULL, id, emoji, &storage, &status);
mstdnt_status_emoji_react(api, &m_args, NULL, NULL, id, emoji);
mstdnt_cleanup_status(&status, 0);
mstdnt_storage_cleanup(&storage);
return 0;
}
@ -144,37 +143,35 @@ int try_interact_status(struct session* ssn, mastodont_t* api, char* id)
struct mstdnt_args m_args;
set_mstdnt_args(&m_args, ssn);
int res = 0;
struct mstdnt_storage storage = { 0 };
if (!(keystr(ssn->post.itype) && id)) return 1;
// Pretty up the type
if (strcmp(keystr(ssn->post.itype), "like") == 0 ||
strcmp(keystr(ssn->post.itype), "likeboost") == 0)
res = mstdnt_favourite_status(api, &m_args, NULL, NULL, id, &storage, NULL);
res = mstdnt_favourite_status(api, &m_args, NULL, NULL, id);
// Not else if because possibly a like-boost
if (strcmp(keystr(ssn->post.itype), "repeat") == 0 ||
strcmp(keystr(ssn->post.itype), "likeboost") == 0)
res = mstdnt_reblog_status(api, &m_args, NULL, NULL, id, &storage, NULL);
res = mstdnt_reblog_status(api, &m_args, NULL, NULL, id);
else if (strcmp(keystr(ssn->post.itype), "bookmark") == 0)
res = mstdnt_bookmark_status(api, &m_args, NULL, NULL, id, &storage, NULL);
res = mstdnt_bookmark_status(api, &m_args, NULL, NULL, id);
else if (strcmp(keystr(ssn->post.itype), "pin") == 0)
res = mstdnt_pin_status(api, &m_args, NULL, NULL, id, &storage, NULL);
res = mstdnt_pin_status(api, &m_args, NULL, NULL, id);
else if (strcmp(keystr(ssn->post.itype), "mute") == 0)
res = mstdnt_mute_conversation(api, &m_args, NULL, NULL, id, &storage, NULL);
res = mstdnt_mute_conversation(api, &m_args, NULL, NULL, id);
else if (strcmp(keystr(ssn->post.itype), "delete") == 0)
res = mstdnt_delete_status(api, &m_args, NULL, NULL, id, &storage, NULL);
res = mstdnt_delete_status(api, &m_args, NULL, NULL, id);
else if (strcmp(keystr(ssn->post.itype), "unlike") == 0)
res = mstdnt_unfavourite_status(api, &m_args, NULL, NULL, id, &storage, NULL);
res = mstdnt_unfavourite_status(api, &m_args, NULL, NULL, id);
else if (strcmp(keystr(ssn->post.itype), "unrepeat") == 0)
res = mstdnt_unreblog_status(api, &m_args, NULL, NULL, id, &storage, NULL);
res = mstdnt_unreblog_status(api, &m_args, NULL, NULL, id);
else if (strcmp(keystr(ssn->post.itype), "unbookmark") == 0)
res = mstdnt_unbookmark_status(api, &m_args, NULL, NULL, id, &storage, NULL);
res = mstdnt_unbookmark_status(api, &m_args, NULL, NULL, id);
else if (strcmp(keystr(ssn->post.itype), "unpin") == 0)
res = mstdnt_unpin_status(api, &m_args, NULL, NULL, id, &storage, NULL);
res = mstdnt_unpin_status(api, &m_args, NULL, NULL, id);
else if (strcmp(keystr(ssn->post.itype), "unmute") == 0)
res = mstdnt_unmute_conversation(api, &m_args, NULL, NULL, id, &storage, NULL);
res = mstdnt_unmute_conversation(api, &m_args, NULL, NULL, id);
mstdnt_storage_cleanup(&storage);
return res;
}
@ -241,36 +238,59 @@ int status_reply(PATH_ARGS)
content_status(req, ssn, api, data, STATUS_FOCUSED | STATUS_REPLY);
}
static int
request_cb_status_view_reblogs(mstdnt_request_cb_data* cb_data, void* tbargs)
{
struct mstdnt_accounts* accts = MSTDNT_CB_DATA(cb_data);
DESTRUCT_TB_ARGS(tbargs);
content_status_interactions(
req,
ssn,
api,
"Reblogs",
accts->accts,
accts->len);
finish_free_request(req);
return MSTDNT_REQUEST_DONE;
}
int status_view_reblogs(PATH_ARGS)
{
struct mstdnt_args m_args;
set_mstdnt_args(&m_args, ssn);
struct mstdnt_account* reblogs = NULL;
struct mstdnt_storage storage = { 0 };
size_t reblogs_len = 0;
char* status_id = data[0];
mstdnt_status_reblogged_by(api,
&m_args,
NULL, NULL,
status_id,
&storage,
&reblogs,
&reblogs_len);
status_id);
content_status_interactions(
return 0;
}
static int
request_cb_status_view_favourites(mstdnt_request_cb_data* cb_data, void* tbargs)
{
struct mstdnt_accounts* accts = MSTDNT_CB_DATA(cb_data);
DESTRUCT_TB_ARGS(tbargs);
content_status_interactions(
req,
ssn,
api,
"Reblogs",
reblogs,
reblogs_len);
"Favorites",
accts->accts,
accts->len);
mstdnt_storage_cleanup(&storage);
mstdnt_cleanup_accounts(reblogs, reblogs_len);
finish_free_request(req);
return MSTDNT_REQUEST_DONE;
}
int status_view_favourites(PATH_ARGS)
int
status_view_favourites(PATH_ARGS)
{
struct mstdnt_args m_args;
set_mstdnt_args(&m_args, ssn);
@ -279,24 +299,15 @@ int status_view_favourites(PATH_ARGS)
size_t favourites_len = 0;
char* status_id = data[0];
struct request_args* cb_args =
request_args_create(req, ssn, api, NULL);
mstdnt_status_favourited_by(api,
&m_args,
NULL, NULL,
status_id,
&storage,
&favourites,
&favourites_len);
content_status_interactions(
req,
ssn,
api,
"Favorites",
favourites,
favourites_len);
request_cb_status_view_favourites, cb_args,
status_id);
mstdnt_storage_cleanup(&storage);
mstdnt_cleanup_accounts(favourites, favourites_len);
return 0;
}
void content_status_interactions(FCGX_Request* req,
@ -333,6 +344,7 @@ void content_status_interactions(FCGX_Request* req,
void content_status(PATH_ARGS, uint8_t flags)
{
#if 0
struct mstdnt_args m_args;
set_mstdnt_args(&m_args, ssn);
struct mstdnt_storage storage = {0}, status_storage = {0};
@ -398,6 +410,7 @@ void content_status(PATH_ARGS, uint8_t flags)
mstdnt_storage_cleanup(&status_storage);
tb_free(dup);
tb_free(picker);
#endif
}
int notice_redirect(PATH_ARGS)