monkee.ch/snac2
1
0
Fork 0
mirror of https://codeberg.org/grunfink/snac2.git synced 2024-11-15 01:55:03 +00:00
Code Issues Projects Releases Packages Wiki Activity
snac2/main.c

337 lines
7.9 KiB
C
Raw Normal View History

[main.c] New file.
2022-09-19 19:32:36 +00:00
/* snac - A simple, minimalistic ActivityPub instance */
Updated year in copyright notices.
2023-01-17 08:50:16 +00:00
/* copyright (c) 2022 - 2023 grunfink / MIT license */
[main.c] New file.
2022-09-19 19:32:36 +00:00
#include "xs.h"
Started command-line command 'note'.
2022-09-27 07:51:39 +00:00
#include "xs_io.h"
More work in http signed request.
2022-09-21 07:31:05 +00:00
#include "xs_encdec.h"
#include "xs_json.h"
[main.c] New file.
2022-09-19 19:32:36 +00:00
#include "snac.h"
Tweaked user and group permissions for new files and dirs.
2023-02-07 08:01:57 +00:00
#include <sys/stat.h>
More httpd work.
2022-09-21 16:27:30 +00:00
int usage(void)
{
Version 2.01 RELEASED.
2022-10-03 17:17:12 +00:00
printf("snac " VERSION " - A simple, minimalistic ActivityPub instance\n");
Updated year in copyright notices.
2023-01-17 08:50:16 +00:00
printf("Copyright (c) 2022 - 2023 grunfink / MIT license\n");
Some fixes to timeline_add().
2022-09-25 07:07:43 +00:00
printf("\n");
printf("Commands:\n");
printf("\n");
Minor message corrections.
2023-01-13 14:15:14 +00:00
printf("init [{basedir}] Initializes the data storage\n");
New command-line command 'upgrade'.
2022-11-25 09:53:16 +00:00
printf("upgrade {basedir} Upgrade to a new version\n");
New function adduser().
2022-10-04 07:40:16 +00:00
printf("adduser {basedir} [{uid}] Adds a new user\n");
Some fixes to timeline_add().
2022-09-25 07:07:43 +00:00
printf("httpd {basedir} Starts the HTTPD daemon\n");
New command-line option purge.
2022-10-04 16:46:12 +00:00
printf("purge {basedir} Purges old data\n");
Some fixes to timeline_add().
2022-09-25 07:07:43 +00:00
printf("webfinger {basedir} {user} Queries about a @user@host or actor\n");
printf("queue {basedir} {uid} Processes a user queue\n");
New function msg_follow().
2022-09-27 13:28:08 +00:00
printf("follow {basedir} {uid} {actor} Follows an actor\n");
New command-line command 'unfollow'.
2022-10-13 13:44:38 +00:00
printf("unfollow {basedir} {uid} {actor} Unfollows an actor\n");
Some fixes to timeline_add().
2022-09-25 07:07:43 +00:00
printf("request {basedir} {uid} {url} Requests an object\n");
printf("actor {basedir} {uid} {url} Requests an actor\n");
Started command-line command 'note'.
2022-09-27 07:51:39 +00:00
printf("note {basedir} {uid} {'text'} Sends a note to followers\n");
New command line option 'resetpwd'.
2022-12-04 20:26:24 +00:00
printf("resetpwd {basedir} {uid} Resets the password of a user\n");
Implemented 'Ping' and 'Pong' activities. According to https://humungus.tedunangst.com/r/honk/v/tip/f/docs/ping.txt
2023-05-05 07:54:41 +00:00
printf("ping {basedir} {uid} {actor} Pings an actor\n");
Some fixes to timeline_add().
2022-09-25 07:07:43 +00:00
More httpd work.
2022-09-21 16:27:30 +00:00
return 1;
}
Some fixes to timeline_add().
2022-09-25 07:07:43 +00:00
char *get_argv(int *argi, int argc, char *argv[])
{
if (*argi < argc)
return argv[(*argi)++];
else
return NULL;
}
#define GET_ARGV() get_argv(&argi, argc, argv)
Fixed a nasty macro expansion bug.
2022-10-26 04:43:47 +00:00
d_char *html_timeline(snac *snac, char *list, int local);
New function msg_actor().
2022-09-25 19:02:47 +00:00
[main.c] New file.
2022-09-19 19:32:36 +00:00
int main(int argc, char *argv[])
More httpd work.
2022-09-21 16:27:30 +00:00
{
char *cmd;
char *basedir;
More webfinger work.
2022-09-22 09:28:13 +00:00
char *user;
[activitypub.c] New file.
2022-09-23 15:33:33 +00:00
char *url;
More httpd work.
2022-09-21 16:27:30 +00:00
int argi = 1;
Improved activitypub_request().
2022-09-23 16:15:59 +00:00
snac snac;
More httpd work.
2022-09-21 16:27:30 +00:00
Tweaked user and group permissions for new files and dirs.
2023-02-07 08:01:57 +00:00
/* ensure group has write access */
umask(0007);
Some fixes to timeline_add().
2022-09-25 07:07:43 +00:00
if ((cmd = GET_ARGV()) == NULL)
More httpd work.
2022-09-21 16:27:30 +00:00
return usage();
if (strcmp(cmd, "init") == 0) {
Minor message corrections.
2023-01-13 14:15:14 +00:00
/* initialize the data storage */
Some fixes to timeline_add().
2022-09-25 07:07:43 +00:00
/* ... */
basedir = GET_ARGV();
More symbol renaming.
2023-01-31 17:38:56 +00:00
return snac_init(basedir);
More httpd work.
2022-09-21 16:27:30 +00:00
}
New command-line command 'upgrade'.
2022-11-25 09:53:16 +00:00
if (strcmp(cmd, "upgrade") == 0) {
int ret;
Minor message corrections.
2023-01-13 14:15:14 +00:00
/* upgrade */
New command-line command 'upgrade'.
2022-11-25 09:53:16 +00:00
if ((basedir = GET_ARGV()) == NULL)
return usage();
if ((ret = srv_open(basedir, 1)) == 1)
srv_log(xs_dup("OK"));
return ret;
}
Added more tests.
2022-11-09 10:53:16 +00:00
if (strcmp(cmd, "markdown") == 0) {
/* undocumented, for testing only */
xs *c = xs_readall(stdin);
Some formatting refactoring.
2022-11-13 07:41:50 +00:00
xs *fc = not_really_markdown(c);
Added more tests.
2022-11-09 10:53:16 +00:00
printf("<html>\n%s\n</html>\n", fc);
return 0;
}
Some fixes to timeline_add().
2022-09-25 07:07:43 +00:00
if ((basedir = GET_ARGV()) == NULL)
More httpd work.
2022-09-21 16:27:30 +00:00
return usage();
New command-line command 'upgrade'.
2022-11-25 09:53:16 +00:00
if (!srv_open(basedir, 0)) {
Minor message corrections.
2023-01-13 14:15:14 +00:00
srv_log(xs_fmt("error opening data storage at %s", basedir));
More httpd work.
2022-09-21 16:27:30 +00:00
return 1;
}
New function adduser().
2022-10-04 07:40:16 +00:00
if (strcmp(cmd, "adduser") == 0) {
user = GET_ARGV();
return adduser(user);
return 0;
}
More httpd work.
2022-09-21 16:27:30 +00:00
if (strcmp(cmd, "httpd") == 0) {
httpd();
Call srv_free().
2022-10-25 08:38:32 +00:00
srv_free();
More httpd work.
2022-09-21 16:27:30 +00:00
return 0;
}
New command-line option purge.
2022-10-04 16:46:12 +00:00
if (strcmp(cmd, "purge") == 0) {
New function purge_all().
2022-10-17 09:00:34 +00:00
purge_all();
New command-line option purge.
2022-10-04 16:46:12 +00:00
return 0;
}
Some fixes to timeline_add().
2022-09-25 07:07:43 +00:00
if ((user = GET_ARGV()) == NULL)
More webfinger work.
2022-09-22 09:28:13 +00:00
return usage();
if (strcmp(cmd, "webfinger") == 0) {
xs *actor = NULL;
xs *uid = NULL;
int status;
webfinger_request() returns the status.
2022-09-23 15:36:40 +00:00
status = webfinger_request(user, &actor, &uid);
More webfinger work.
2022-09-22 09:28:13 +00:00
printf("status: %d\n", status);
if (actor != NULL)
printf("actor: %s\n", actor);
if (uid != NULL)
printf("uid: %s\n", uid);
return 0;
}
Improved activitypub_request().
2022-09-23 16:15:59 +00:00
if (!user_open(&snac, user)) {
printf("error in user '%s'\n", user);
return 1;
}
Added a source (web, mastoapi, etc) to lastlog_write().
2023-05-08 07:02:45 +00:00
lastlog_write(&snac, "cmdline");
New command line option 'resetpwd'.
2022-12-04 20:26:24 +00:00
if (strcmp(cmd, "resetpwd") == 0) {
return resetpwd(&snac);
}
Some fixes to timeline_add().
2022-09-25 07:07:43 +00:00
if (strcmp(cmd, "queue") == 0) {
process_queue() has been renamed to process_user_queue().
2023-02-02 03:50:51 +00:00
process_user_queue(&snac);
Some fixes to timeline_add().
2022-09-25 07:07:43 +00:00
return 0;
}
Fixed a nasty macro expansion bug.
2022-10-26 04:43:47 +00:00
if (strcmp(cmd, "timeline") == 0) {
timeline_top_level() works.
2022-11-26 17:52:51 +00:00
#if 0
Use macro XS_ALL were possible.
2022-11-25 11:21:26 +00:00
xs *list = local_list(&snac, XS_ALL);
Fixed a nasty macro expansion bug.
2022-10-26 04:43:47 +00:00
xs *body = html_timeline(&snac, list, 1);
printf("%s\n", body);
user_free(&snac);
srv_free();
timeline_top_level() works.
2022-11-26 17:52:51 +00:00
#endif
xs *idx = xs_fmt("%s/private.idx", snac.basedir);
Pagination of the public and private page Use the query parameters skip and show to control what you can see, e.g. /alex/admin?skip=0&show=4 Don't use or save the timeline cache if either is set. The following functions were changed from accepting a single max parameter to accepting both skip and show: timeline_simple_list, timeline_list, index_list_desc.
2022-12-04 20:28:29 +00:00
xs *list = index_list_desc(idx, 0, 256);
timeline_top_level() now looks for the entries in the user caches.
2023-02-08 12:21:44 +00:00
xs *tl = timeline_top_level(&snac, list);
timeline_top_level() works.
2022-11-26 17:52:51 +00:00
xs *j = xs_json_dumps_pp(tl, 4);
printf("%s\n", j);
Fixed a nasty macro expansion bug.
2022-10-26 04:43:47 +00:00
return 0;
}
Some fixes to timeline_add().
2022-09-25 07:07:43 +00:00
if ((url = GET_ARGV()) == NULL)
return usage();
New function msg_admiration().
2022-09-26 08:08:14 +00:00
if (strcmp(cmd, "announce") == 0) {
xs *msg = msg_admiration(&snac, url, "Announce");
More work but signatures seem to still fail.
2022-09-26 09:19:45 +00:00
if (msg != NULL) {
Replaced all calls to post() with enqueue_message().
2022-12-16 06:16:00 +00:00
enqueue_message(&snac, msg);
More work but signatures seem to still fail.
2022-09-26 09:19:45 +00:00
New function msg_follow().
2022-09-27 13:28:08 +00:00
if (dbglevel) {
xs *j = xs_json_dumps_pp(msg, 4);
printf("%s\n", j);
}
}
return 0;
}
if (strcmp(cmd, "follow") == 0) {
xs *msg = msg_follow(&snac, url);
if (msg != NULL) {
char *actor = xs_dict_get(msg, "object");
following_add(&snac, actor, msg);
New function enqueue_output_to_actor().
2022-11-18 07:21:40 +00:00
enqueue_output_by_actor(&snac, msg, actor, 0);
New function msg_follow().
2022-09-27 13:28:08 +00:00
if (dbglevel) {
xs *j = xs_json_dumps_pp(msg, 4);
printf("%s\n", j);
}
New function msg_admiration().
2022-09-26 08:08:14 +00:00
}
return 0;
}
New command-line command 'unfollow'.
2022-10-13 13:44:38 +00:00
if (strcmp(cmd, "unfollow") == 0) {
xs *object = NULL;
if (valid_status(following_get(&snac, url, &object))) {
xs *msg = msg_undo(&snac, xs_dict_get(object, "object"));
following_del(&snac, url);
New function enqueue_output_to_actor().
2022-11-18 07:21:40 +00:00
enqueue_output_by_actor(&snac, msg, url, 0);
New command-line command 'unfollow'.
2022-10-13 13:44:38 +00:00
snac_log(&snac, xs_fmt("unfollowed actor %s", url));
}
else
snac_log(&snac, xs_fmt("actor is not being followed %s", url));
return 0;
}
Implemented 'Ping' and 'Pong' activities. According to https://humungus.tedunangst.com/r/honk/v/tip/f/docs/ping.txt
2023-05-05 07:54:41 +00:00
if (strcmp(cmd, "ping") == 0) {
The 'ping' command-line requests the actor for better error info.
2023-05-05 10:47:17 +00:00
xs *actor_o = NULL;
Implemented 'Ping' and 'Pong' activities. According to https://humungus.tedunangst.com/r/honk/v/tip/f/docs/ping.txt
2023-05-05 07:54:41 +00:00
The 'ping' command-line requests the actor for better error info.
2023-05-05 10:47:17 +00:00
if (valid_status(actor_request(&snac, url, &actor_o))) {
xs *msg = msg_ping(&snac, url);
Implemented 'Ping' and 'Pong' activities. According to https://humungus.tedunangst.com/r/honk/v/tip/f/docs/ping.txt
2023-05-05 07:54:41 +00:00
The 'ping' command-line requests the actor for better error info.
2023-05-05 10:47:17 +00:00
enqueue_output_by_actor(&snac, msg, url, 0);
if (dbglevel) {
xs *j = xs_json_dumps_pp(msg, 4);
printf("%s\n", j);
}
}
else {
srv_log(xs_fmt("Error getting actor %s", url));
return 1;
Implemented 'Ping' and 'Pong' activities. According to https://humungus.tedunangst.com/r/honk/v/tip/f/docs/ping.txt
2023-05-05 07:54:41 +00:00
}
return 0;
}
[activitypub.c] New file.
2022-09-23 15:33:33 +00:00
if (strcmp(cmd, "request") == 0) {
Improved activitypub_request().
2022-09-23 16:15:59 +00:00
int status;
xs *data = NULL;
status = activitypub_request(&snac, url, &data);
printf("status: %d\n", status);
if (valid_status(status)) {
xs *j = xs_json_dumps_pp(data, 4);
printf("%s\n", j);
}
Fixed bug in actor_request().
2022-09-23 16:46:30 +00:00
return 0;
}
if (strcmp(cmd, "actor") == 0) {
int status;
xs *data = NULL;
status = actor_request(&snac, url, &data);
printf("status: %d\n", status);
Started function not_really_markdown().
2022-09-27 07:38:46 +00:00
if (valid_status(status)) {
xs *j = xs_json_dumps_pp(data, 4);
printf("%s\n", j);
}
Fixed bug in actor_request().
2022-09-23 16:46:30 +00:00
return 0;
[activitypub.c] New file.
2022-09-23 15:33:33 +00:00
}
Started command-line command 'note'.
2022-09-27 07:51:39 +00:00
if (strcmp(cmd, "note") == 0) {
xs *content = NULL;
Notes can be posted WOW!.
2022-09-27 12:07:36 +00:00
xs *msg = NULL;
xs *c_msg = NULL;
More work in msg_note().
2022-09-27 12:50:13 +00:00
char *in_reply_to = GET_ARGV();
Started command-line command 'note'.
2022-09-27 07:51:39 +00:00
The 'note' command now accepts -e and -.
2023-02-05 18:54:41 +00:00
if (strcmp(url, "-e") == 0) {
Started command-line command 'note'.
2022-09-27 07:51:39 +00:00
/* get the content from an editor */
FILE *f;
The 'note' command now accepts -e and -.
2023-02-05 18:54:41 +00:00
unlink("/tmp/snac-edit.txt");
Started command-line command 'note'.
2022-09-27 07:51:39 +00:00
system("$EDITOR /tmp/snac-edit.txt");
if ((f = fopen("/tmp/snac-edit.txt", "r")) != NULL) {
content = xs_readall(f);
fclose(f);
unlink("/tmp/snac-edit.txt");
}
else {
printf("Nothing to send\n");
return 1;
}
}
The 'note' command now accepts -e and -.
2023-02-05 18:54:41 +00:00
else
if (strcmp(url, "-") == 0) {
/* get the content from stdin */
content = xs_readall(stdin);
}
Started command-line command 'note'.
2022-09-27 07:51:39 +00:00
else
content = xs_dup(url);
New boolean argument 'priv' to msg_note().
2023-02-20 08:32:44 +00:00
msg = msg_note(&snac, content, NULL, in_reply_to, NULL, 0);
Notes can be posted WOW!.
2022-09-27 12:07:36 +00:00
c_msg = msg_create(&snac, msg);
New function msg_follow().
2022-09-27 13:28:08 +00:00
if (dbglevel) {
Notes can be posted WOW!.
2022-09-27 12:07:36 +00:00
xs *j = xs_json_dumps_pp(c_msg, 4);
printf("%s\n", j);
}
Started command-line command 'note'.
2022-09-27 07:51:39 +00:00
Replaced all calls to post() with enqueue_message().
2022-12-16 06:16:00 +00:00
enqueue_message(&snac, c_msg);
Started command-line command 'note'.
2022-09-27 07:51:39 +00:00
Deleted unused arguments in timeline_add().
2023-01-11 19:40:13 +00:00
timeline_add(&snac, xs_dict_get(msg, "id"), msg);
More work in msg_note().
2022-09-27 12:50:13 +00:00
Started command-line command 'note'.
2022-09-27 07:51:39 +00:00
return 0;
}
More httpd work.
2022-09-21 16:27:30 +00:00
return 0;
}
Reference in a new issue Copy permalink