Start renaming s/ap_activity/ap_object/

src/controller/activity_pub.c

@@ -38,7 +38,7 @@ bool route_ap_note( struct http_request* req )
 	ap_activity_write_to_FILE( act, f );
 	fflush(f);
 
-	ap_activity_free(act);
+	ap_object_free(act);
 
 	status_free(s);
 

src/controller/cli.c

@@ -179,9 +179,9 @@ static bool handle_command_test( struct cli_request* req )
 	ap_activity_write_to_FILE( create, stdout );
 	printf( "\n" );
 
-	ap_activity_free(create);
-	ap_activity_free(note);
-	ap_activity_free(note2);
+	ap_object_free(create);
+	ap_object_free(note);
+	ap_object_free(note2);
 	status_free(s);
 	account_free(owner_account);
 	*/

src/controller/inbox.c

@@ -537,7 +537,7 @@ cleanup:
 		result = true;
 	}
 
-	ap_activity_free(act);
+	ap_object_free(act);
 	ap_envelope_free(env);
 	printf( "result=%c\n", result ? 'T' : 'F' );
 	return result;

src/controller/outbox.c

@@ -26,7 +26,7 @@ static bool process_envelope( struct outbox_envelope* env )
 	char* postdata = NULL;
 	struct crypto_keys* keys = NULL;
 	FILE* f = NULL;
-	struct ap_activity* act = NULL;
+	struct ap_object* act = NULL;
 
 	if( env->sent ) { return false; }
 	if( env->retry_after > time(NULL) ) { return false; }
@@ -142,7 +142,7 @@ static bool process_envelope( struct outbox_envelope* env )
 	goto failed;
 
 cleanup:
-	ap_activity_free(act);
+	ap_object_free(act);
 	account_free(to_account);
 	free(postdata);
 

src/dev.c

@@ -21,7 +21,7 @@
 void develop()
 {
 	// TODO: remove memory leak
-	struct ap_activity* act = ap_activity_from_local_id(27);
-	ap_activity_free(act);
+	struct ap_object* act = ap_activity_from_local_id(27);
+	ap_object_free(act);
 }
 

src/model/account.c

@@ -512,8 +512,8 @@ void account_create( struct account* a, struct status* s )
 	outbox_envelope_list_save(&oel);
 	outbox_envelope_list_free_composite(&oel);
 
-	ap_activity_free(create);
-	ap_activity_free(note);
+	ap_object_free(create);
+	ap_object_free(note);
 }
 void account_announce( struct account* a, struct status* s )
 {
@@ -558,7 +558,7 @@ void account_announce( struct account* a, struct status* s )
 
 cleanup:
 	account_free(origin_post_account);
-	ap_activity_free(act);
+	ap_object_free(act);
 }
 
 void account_deliver_activity( struct account* a, struct ap_activity* act, struct outbox_envelope_list* oel )
@@ -637,7 +637,7 @@ void account_unfollow( struct account* a, struct account* to_unfollow )
 
 	// Federate Undo Activity
 	ap_activity_undo(act,to_unfollow->id);
-	ap_activity_free(act);
+	ap_object_free(act);
 
 	// Update following list
 	ffdb_trie_remove( index, key );
@@ -706,7 +706,7 @@ bool account_does_follow( struct account* a, int account_id )
 
 void account_update( struct account* a )
 {
-	struct ap_activity* act;
+	struct ap_object* act;
 	act = malloc(sizeof(*act));
 	memset(act,0,sizeof(*act));
 
@@ -718,6 +718,6 @@ void account_update( struct account* a )
 
 	ap_activity_write_to_FILE( act, stdout );
 
-	ap_activity_free(act);
+	ap_object_free(act);
 }
 

src/model/ap/activity.c

@@ -113,7 +113,7 @@ struct ap_activity* ap_activity_dup( struct ap_activity* act )
 
 	return new_act;
 }
-void ap_activity_free( struct ap_activity* act )
+void ap_object_free( struct ap_activity* act )
 {
 	if( !act ) { return; }
 	ap_activity_free_composite(act);
@@ -197,7 +197,7 @@ void ap_object_ptr_or_ref_free_composite( struct ap_object_ptr_or_ref* o )
 			free( o->ref );
 			break;
 		case apaot_activity:
-			ap_activity_free( o->ptr );
+			ap_object_free( o->ptr );
 			o->ptr = NULL;
 			break;
 	};
@@ -233,7 +233,7 @@ void ap_activity_accept( struct ap_activity* act, int deliver_to_account_id )
 	outbox_envelope_save( env );
 	outbox_envelope_free( env );
 
-	ap_activity_free(accept);
+	ap_object_free(accept);
 }
 
 struct ap_activity* ap_activity_create_emoji_react( struct status* s, const char* react )
@@ -282,7 +282,7 @@ void ap_activity_react( struct status* s, const char* react )
 	outbox_envelope_save( env );
 	outbox_envelope_free( env );
 
-	ap_activity_free(act);
+	ap_object_free(act);
 }
 
 struct ap_activity* ap_activity_create_follow( struct account* follower, struct account* following )
@@ -322,7 +322,7 @@ int ap_activity_follow( struct account* follower, struct account* following )
 	outbox_envelope_save( env );
 	outbox_envelope_free( env );
 cleanup:
-	ap_activity_free(act);
+	ap_object_free(act);
 	return res;
 failed:
 	res = -1;
@@ -370,7 +370,7 @@ void ap_activity_undo( struct ap_activity* act, int deliver_to_account_id )
 	outbox_envelope_save( env );
 	outbox_envelope_free( env );
 cleanup:
-	ap_activity_free(undo_act);
+	ap_object_free(undo_act);
 	return;
 failed:
 	goto cleanup;

src/model/ap/activity.h

@@ -190,14 +190,14 @@ struct ap_object
 };
 
 struct json_object_field;
-extern struct json_field_type ap_activity_type;
-extern struct json_object_field ap_activity_layout[];
+extern struct json_field_type ap_object_type;
+extern struct json_object_field ap_object_layout[];
 
 struct ap_object* ap_activity_new();
 struct ap_object* ap_activity_dup( struct ap_object* o );
 struct ap_object* ap_activity_from_FILE( FILE* f );
 struct ap_object* ap_activity_from_local_id( int id );
-void ap_activity_free( struct ap_object* o );
+void ap_object_free( struct ap_object* o );
 void ap_activity_free_composite( struct ap_object* o );
 
 void ap_activity_write_to_FILE( struct ap_object* o, FILE* f );

src/model/ap/activity/layout.c

@@ -57,27 +57,27 @@ struct json_enum ap_object_type_enum[] = {
 struct json_tagged_union_typelist activity_ref_types[] = {
 	{
 		.tag_value = apaot_ref,
-		.offset = offsetof( struct ap_activity, object.ref ),
+		.offset = offsetof( struct ap_object, object.ref ),
 		.type = &json_field_string
 	},
 	{
 		.tag_value = apaot_activity,
-		.offset = offsetof( struct ap_activity, object.ptr ),
-		.type = &ap_activity_type
+		.offset = offsetof( struct ap_object, object.ptr ),
+		.type = &ap_object_type
 	},
 	JSON_TAGGED_UNION_TYPELIST_END,
 };
 struct json_tagged_union_typelist signature_types[] = {
 	{
 		.tag_value = 1,
-		.offset = offsetof( struct ap_activity, signature ),
+		.offset = offsetof( struct ap_object, signature ),
 		.type = &ap_signature_composite_type,
 	},
 	JSON_TAGGED_UNION_TYPELIST_END,
 };
 
-#define OBJ_TYPE struct ap_activity
-struct json_object_field ap_activity_layout[] = {
+#define OBJ_TYPE struct ap_object
+struct json_object_field ap_object_layout[] = {
 	{
 		.key = "@context",
 		.offset = offsetof( OBJ_TYPE, ap_context ),
@@ -91,7 +91,7 @@ struct json_object_field ap_activity_layout[] = {
 
 	{
 		.key = "content",
-		.offset = offsetof( struct ap_activity, content ),
+		.offset = offsetof( OBJ_TYPE, content ),
 		.required = false,
 		.type = &ap_activity_source_type
 	},
@@ -99,13 +99,13 @@ struct json_object_field ap_activity_layout[] = {
 	JSON_FIELD_DATETIME(published,false),
 	{
 		.key = "sensitive",
-		.offset = offsetof( struct ap_activity, sensitive ),
+		.offset = offsetof( OBJ_TYPE, sensitive ),
 		.required = false,
 		.type = &json_field_bool_or_null
 	},
 	{
 		.key = "source",
-		.offset = offsetof( struct ap_activity, source ),
+		.offset = offsetof( OBJ_TYPE, source ),
 		.required = false,
 		.type = &ap_activity_source_type
 	},
@@ -119,7 +119,7 @@ struct json_object_field ap_activity_layout[] = {
 
 	{
 		.key = "tag",
-		.offset = offsetof( struct ap_activity, tags ),
+		.offset = offsetof( OBJ_TYPE, tags ),
 		.required = false,
 		.type = &json_field_array_of,
 		.allow_drop_empty_array = true,
@@ -127,7 +127,7 @@ struct json_object_field ap_activity_layout[] = {
 	},
 	{
 		.key = "alsoKnownAs",
-		.offset = offsetof( struct ap_activity, also_known_as ),
+		.offset = offsetof( OBJ_TYPE, also_known_as ),
 		.required = false,
 		.allow_drop_empty_array = true,
 		.type = &json_field_array_of,
@@ -145,14 +145,14 @@ struct json_object_field ap_activity_layout[] = {
 
 	{
 		.key = "directMessage",
-		.offset = offsetof( struct ap_activity, direct_message ),
+		.offset = offsetof( OBJ_TYPE, direct_message ),
 		.required = false,
 		.type = &json_field_bool
 	},
 
 	{
 		.key = "attachment",
-		.offset = offsetof( struct ap_activity, attachments ),
+		.offset = offsetof( OBJ_TYPE, attachments ),
 		.required = false,
 		.allow_drop_empty_array = true,
 		.type = &json_field_array_of,
@@ -185,7 +185,7 @@ struct json_object_field ap_activity_layout[] = {
 	},
 	{
 		.key = "object",
-		.offset = offsetof( struct ap_activity, object.tag ),
+		.offset = offsetof( OBJ_TYPE, object.tag ),
 		.required = false,
 		.type = &json_field_tagged_union,
 		.tagged_item_types = activity_ref_types
@@ -193,7 +193,7 @@ struct json_object_field ap_activity_layout[] = {
 
 	{
 		.key = "signature",
-		.offset = offsetof( struct ap_activity, has_signature ),
+		.offset = offsetof( OBJ_TYPE, has_signature ),
 		.required = false,
 		.type = &json_field_tagged_union,
 		.tagged_item_types = signature_types
@@ -220,21 +220,21 @@ struct json_object_field ap_activity_layout[] = {
 };
 #undef OBJ_TYPE
 
-JSON_FIELD_TYPE_OBJECT_LAYOUT_WITH_DEFAULTS( ap_activity );
+JSON_FIELD_TYPE_OBJECT_LAYOUT_WITH_DEFAULTS( ap_object );
 
-struct ap_activity* ap_activity_from_FILE( FILE* f )
+struct ap_object* ap_activity_from_FILE( FILE* f )
 {
-	struct ap_activity* act = malloc(sizeof(struct ap_activity));
+	struct ap_object* act = malloc(sizeof(struct ap_object));
 	memset(act,0,sizeof(*act));
 
-	if( !json_read_object_layout_from_FILE( f, ap_activity_layout, act ) ) {
-		ap_activity_free(act);
+	if( !json_read_object_layout_from_FILE( f, ap_object_layout, act ) ) {
+		ap_object_free(act);
 		return NULL;
 	}
 
 	if( !act->actor ) {
 		if( !act->attributed_to ) {
-			ap_activity_free(act);
+			ap_object_free(act);
 			return NULL;
 		}
 		act->actor = strdup(act->attributed_to);
@@ -243,31 +243,31 @@ struct ap_activity* ap_activity_from_FILE( FILE* f )
 	return act;
 }
 
-void ap_activity_write_to_FILE( struct ap_activity* act, FILE* f )
+void ap_activity_write_to_FILE( struct ap_object* act, FILE* f )
 {
 	struct json_writer jw = {
 		.f = f,
 		.indentation = "\t",
 		.indent = 0,
 	};
-	json_write_pretty_object_layout( &jw, ap_activity_layout, act );
+	json_write_pretty_object_layout( &jw, ap_object_layout, act );
 }
-void ap_activity_save( struct ap_activity* act )
+void ap_activity_save( struct ap_object* act )
 {
 	char filename[512];
 	snprintf( filename, sizeof(filename), "data/activities/%d.json", act->local_id );
 
-	json_write_object_layout_to_file( filename, "\t", ap_activity_layout, act );
+	json_write_object_layout_to_file( filename, "\t", ap_object_layout, act );
 }
-struct ap_activity* ap_activity_from_local_id( int id )
+struct ap_object* ap_activity_from_local_id( int id )
 {
-	struct ap_activity* act = ap_activity_new();
+	struct ap_object* act = ap_activity_new();
 
 	char filename[512];
 	snprintf( filename, sizeof(filename), "data/activities/%d.json", id );
 
-	if( !json_read_object_layout_from_file( filename, ap_activity_layout, act ) ) {
-		ap_activity_free(act);
+	if( !json_read_object_layout_from_file( filename, ap_object_layout, act ) ) {
+		ap_object_free(act);
 		return NULL;
 	}
 

src/model/status.c

@@ -345,7 +345,7 @@ bool status_sync_from_uri( struct status* s, const char* uri )
 	result = true;
 cleanup:
 	if( f ) { fclose(f); }
-	ap_activity_free(act);
+	ap_object_free(act);
 	return result;
 failed:
 	if( s ) {