teknomunk
/
apogee
1
0
Fork 0
Code Issues 17 Pull Requests Packages Projects Releases Wiki Activity

Refactor to use activity_new_local_activity, populate replies field for Notes

Browse Source
master
teknomunk 1 year ago
parent fc246cd4d5
commit a9a8dd13b6
5 changed files with 27 additions and 53 deletions
Show Stats Download Patch File Download Diff File

2
src/ap

@ -1 +1 @@
Subproject commit b8fbb768549e2f933d7b37a6bbf5c2bd3b1c6087
Subproject commit c1a1148184cd335366b97a2efaae116a526b6de9

38
src/model/account/ap_data.c
Unescape View File

@ -27,12 +27,7 @@ struct ap_object* account_activity_pub( struct account* a )
struct ap_object* account_ap_actor( struct account* a )
{
struct ap_object* act;
act = malloc(sizeof(*act));
memset(act,0,sizeof(*act));
ap_object_add_context( act, "https://www.w3.org/ns/activitystreams");
ap_object_add_context( act, "https://apogee.polaris-1.work/schemas/litepub-0.1.jsonld");
struct ap_object* act = activity_new_local_activity();
act->published = time(NULL);
act->type = ap_Person;
act->id = aformat( "https://%s/owner/actor", g_server->domain );
@ -95,12 +90,7 @@ struct ap_object* account_ap_actor( struct account* a )
struct ap_object* account_ap_outbox( struct account* a )
{
struct ap_object* outbox;
outbox = malloc(sizeof(*outbox));
memset(outbox,0,sizeof(*outbox));
ap_object_add_context( outbox, "https://www.w3.org/ns/activitystreams");
ap_object_add_context( outbox, "https://apogee.polaris-1.work/schemas/litepub-0.1.jsonld");
struct ap_object* outbox = activity_new_local_activity();
outbox->type = ap_OrderedCollection;
outbox->published = time(NULL);
outbox->id = aformat( "https://%s/outbox", g_server->domain );
@ -120,11 +110,7 @@ struct ap_object* account_ap_outbox_page( struct account* a, int page )
if( page >= page_count ) { return NULL; }
struct ap_object* outbox;
outbox = malloc(sizeof(*outbox));
memset(outbox,0,sizeof(*outbox));
ap_object_add_context( outbox, "https://www.w3.org/ns/activitystreams");
ap_object_add_context( outbox, "https://apogee.polaris-1.work/schemas/litepub-0.1.jsonld");
struct ap_object* outbox = activity_new_local_activity();
struct {
char** items;
@ -203,11 +189,7 @@ static struct ap_object* account_list_page( int page, char* part_of, const char*
if( page >= page_count ) { return NULL; }
struct ap_object* o;
o = malloc(sizeof(*o));
memset(o,0,sizeof(*o));
ap_object_add_context( o, "https://www.w3.org/ns/activitystreams");
ap_object_add_context( o, "https://apogee.polaris-1.work/schemas/litepub-0.1.jsonld");
struct ap_object* o = activity_new_local_activity();
struct {
char** items;
@ -249,11 +231,7 @@ struct ap_object* account_ap_followers( struct account* a )
{
if( a->id != 0 ) { return NULL; }
struct ap_object* o;
o = malloc(sizeof(*o));
memset(o,0,sizeof(*o));
ap_object_add_context( o, "https://www.w3.org/ns/activitystreams");
ap_object_add_context( o, "https://apogee.polaris-1.work/schemas/litepub-0.1.jsonld");
struct ap_object* o = activity_new_local_activity();
o->type = ap_OrderedCollection;
o->published = time(NULL);
@ -284,11 +262,7 @@ struct ap_object* account_ap_following( struct account* a )
{
if( a->id != 0 ) { return NULL; }
struct ap_object* o;
o = malloc(sizeof(*o));
memset(o,0,sizeof(*o));
ap_object_add_context( o, "https://www.w3.org/ns/activitystreams");
ap_object_add_context( o, "https://apogee.polaris-1.work/schemas/litepub-0.1.jsonld");
struct ap_object* o = activity_new_local_activity();
o->type = ap_OrderedCollection;
o->published = time(NULL);

33
src/model/activity.c
Unescape View File

@ -49,23 +49,21 @@ struct ap_object* activity_from_local_id( int id )
return act;
}
static struct ap_object* new_local_activity()
struct ap_object* activity_new_local_activity()
{
struct ap_object* act = ap_object_new();
ap_object_add_context( act, "https://www.w3.org/ns/activitystreams");
char buffer[512];
ap_object_add_context( act, format( buffer, 512, "https://%s/schemas/litepub-0.1.jsonld", g_server->domain ) );
return act;
}
struct ap_object* activity_create_Accept( struct ap_object* act )
{
struct ap_object* accept;
accept = malloc(sizeof(*accept));
memset(accept,0,sizeof(*accept));
struct ap_object* accept = activity_new_local_activity();
activity_allocate_local_id(accept);
ap_object_add_context( accept, "https://www.w3.org/ns/activitystreams");
ap_object_add_context( accept, "https://apogee.polaris-1.work/schemas/litepub-0.1.jsonld");
asprintf( &accept->id,"https://%s/activity/%d", g_server->domain, accept->local_id );
accept->type = ap_Accept;
@ -99,7 +97,7 @@ struct ap_object* activity_create_EmojiReact( struct status* s, const char* reac
struct account* a = account_from_id( s->account_id );
struct ap_object* act = new_local_activity();
struct ap_object* act = activity_new_local_activity();
activity_allocate_local_id(act);
act->id = aformat( "https://%s/activity/%d", g_server->domain, act->local_id );
act->actor = aformat( "https://%s/owner/actor", g_server->domain );
@ -139,10 +137,8 @@ void activity_react( struct status* s, const char* react )
struct ap_object* activity_create_Follow( struct account* follower, struct account* following )
{
struct ap_object* act = ap_object_new();
struct ap_object* act = activity_new_local_activity();
activity_allocate_local_id(act);
ap_object_add_context( act, "https://www.w3.org/ns/activitystreams");
ap_object_add_context( act, "https://apogee.polaris-1.work/schemas/litepub-0.1.jsonld");
act->id = aformat( "https://%s/activity/%d", g_server->domain, act->local_id );
act->actor = strdup( follower->account_url );
act->type = ap_Follow;
@ -182,10 +178,8 @@ failed:
struct ap_object* activity_create_Undo( struct ap_object* act_to_undo )
{
struct ap_object* act = ap_object_new();
struct ap_object* act = activity_new_local_activity();
activity_allocate_local_id(act);
ap_object_add_context( act, "https://www.w3.org/ns/activitystreams");
ap_object_add_context( act, "https://apogee.polaris-1.work/schemas/litepub-0.1.jsonld");
act->id = aformat( "https://%s/activity/%d", g_server->domain, act->local_id );
act->actor = strdup( act_to_undo->actor );
act->type = ap_Undo;
@ -228,7 +222,7 @@ failed:
struct ap_object* activity_create_Like( struct status* s )
{
struct ap_object* act = new_local_activity();
struct ap_object* act = activity_new_local_activity();
activity_allocate_local_id(act);
act->id = aformat( "https://%s/activity/%d", g_server->domain, act->local_id );
act->actor = aformat( "https://%s/owner/actor", g_server->domain );
@ -269,7 +263,7 @@ int activity_like( struct status* s )
struct ap_object* activity_create_Note( struct status* s )
{
struct ap_object* act = new_local_activity();
struct ap_object* act = activity_new_local_activity();
act->id = aformat( "https://%s/note/%d", g_server->domain, s->id );
act->type = ap_Note;
act->published = s->published;
@ -288,6 +282,10 @@ struct ap_object* activity_create_Note( struct status* s )
status_free(s_quote_post);
}
// Set the replies
act->replies.tag = apaot_ref;
act->replies.ref = aformat( "https://%s/note/%d/replies", g_server->domain, s->id );
/* set account related parameters */ {
struct account* a = account_from_id( s->account_id );
act->actor = strdup( a->account_url );
@ -353,10 +351,9 @@ struct ap_object* activity_create_Note( struct status* s )
struct ap_object* activity_create_Create( struct ap_object* object )
{
struct ap_object* act = ap_object_new();
struct ap_object* act = activity_new_local_activity();
activity_allocate_local_id(act);
ap_object_add_context( act, "https://www.w3.org/ns/activitystreams");
ap_object_add_context( act, "https://apogee.polaris-1.work/schemas/litepub-0.1.jsonld");
act->type = ap_Create;
act->id = aformat( "https://%s/activity/%d", g_server->domain, act->local_id );
act->object.tag = apaot_activity;

5
src/model/activity.h
Unescape View File

@ -9,7 +9,10 @@ struct ap_object* activity_from_local_id( int id );
void activity_save( struct ap_object* o );
void activity_allocate_local_id( struct ap_object* obj );
// creation
// Helpers
struct ap_object* activity_new_local_activity();
// Creation
struct ap_object* activity_create_Accept( struct ap_object* act );
struct ap_object* activity_create_EmojiReact( struct status* s, const char* react );
struct ap_object* activity_create_Undo( struct ap_object* act );

2
src/model/status.c
Unescape View File

@ -434,7 +434,7 @@ bool status_sync( struct status* s )
struct ap_object* status_replies_Collection( struct status* s )
{
struct ap_object* replies = ap_object_new();
struct ap_object* replies = activity_new_local_activity();
replies->type = ap_Collection;
replies->id = aformat( "https://%s/note/%d/replies", g_server->domain, s->id );
replies->total_items = s->replies.count;

Write Preview
Loading…
Cancel
Save