diff --git a/activitypub.c b/activitypub.c index 764f69d..09fa55e 100644 --- a/activitypub.c +++ b/activitypub.c @@ -85,7 +85,7 @@ int timeline_request(snac *snac, char *id, char *referrer) if (!xs_is_null(id)) { /* is the admired object already there? */ - if (!timeline_here(snac, id)) { + if (!object_here(id)) { xs *object = NULL; /* no; download it */ diff --git a/data.c b/data.c index ecba921..a530f22 100644 --- a/data.c +++ b/data.c @@ -411,6 +411,15 @@ d_char *_object_fn(const char *id) } +int object_here(char *id) +/* checks if an object is already downloaded */ +{ + xs *fn = _object_fn(id); + + return mtime(fn) > 0.0; +} + + int object_get_by_md5(const char *md5, d_char **obj, const char *type) /* returns a stored object, optionally of the requested type */ { @@ -758,15 +767,6 @@ d_char *_timeline_find_fn(snac *snac, char *id) } -int timeline_here(snac *snac, char *id) -/* checks if an object is already downloaded */ -{ - xs *fn = _timeline_find_fn(snac, id); - - return fn != NULL; -} - - d_char *timeline_find(snac *snac, char *id) /* gets a message from the timeline by id */ { diff --git a/snac.h b/snac.h index 4ac3ade..e4a73d8 100644 --- a/snac.h +++ b/snac.h @@ -60,6 +60,7 @@ int index_first(const char *fn, char *buf, int size); d_char *index_list(const char *fn, int max); d_char *index_list_desc(const char *fn, int max); +int object_here(char *id); int object_get_by_md5(const char *md5, d_char **obj, const char *type); int object_get(const char *id, d_char **obj, const char *type); int object_del(const char *id); @@ -75,7 +76,6 @@ int follower_check(snac *snac, const char *actor); d_char *follower_list(snac *snac); double timeline_mtime(snac *snac); -int timeline_here(snac *snac, char *id); d_char *_timeline_find_fn(snac *snac, char *id); d_char *timeline_find(snac *snac, char *id); int timeline_del(snac *snac, char *id);