diff options
| author |  default | 2024-05-11 19:18:07 +0200 |
|---|---|---|
| committer | default | 2024-05-11 19:18:07 +0200 |
| commit | 0a11d70fbecd69e0c93000581b800ff434d42767 (patch) | |
| tree | ae77df1ea5686254090650af3fcfef64817aa28b /mastoapi.c | |
| parent | In timeline_request(), call enqueue_actor_request on actor errors. (diff) | |
| parent | Show 'Event' object types as Notes. (diff) | |
| download | snac2-0a11d70fbecd69e0c93000581b800ff434d42767.tar.gz snac2-0a11d70fbecd69e0c93000581b800ff434d42767.tar.xz snac2-0a11d70fbecd69e0c93000581b800ff434d42767.zip | |
Fixed git conflict.
Diffstat (limited to 'mastoapi.c')
| -rw-r--r-- | mastoapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -1504,7 +1504,7 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path, | |||
| 1504 | /* discard non-Notes */ | 1504 | /* discard non-Notes */ |
| 1505 | const char *id = xs_dict_get(msg, "id"); | 1505 | const char *id = xs_dict_get(msg, "id"); |
| 1506 | const char *type = xs_dict_get(msg, "type"); | 1506 | const char *type = xs_dict_get(msg, "type"); |
| 1507 | if (!xs_match(type, "Note|Question|Page|Article|Video")) | 1507 | if (!xs_match(type, POSTLIKE_OBJECT_TYPE)) |
| 1508 | continue; | 1508 | continue; |
| 1509 | 1509 | ||
| 1510 | const char *from = NULL; | 1510 | const char *from = NULL; |
| @@ -1681,7 +1681,7 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path, | |||
| 1681 | /* discard non-Notes */ | 1681 | /* discard non-Notes */ |
| 1682 | const char *id = xs_dict_get(msg, "id"); | 1682 | const char *id = xs_dict_get(msg, "id"); |
| 1683 | const char *type = xs_dict_get(msg, "type"); | 1683 | const char *type = xs_dict_get(msg, "type"); |
| 1684 | if (!xs_match(type, "Note|Question|Page|Article|Video")) | 1684 | if (!xs_match(type, POSTLIKE_OBJECT_TYPE)) |
| 1685 | continue; | 1685 | continue; |
| 1686 | 1686 | ||
| 1687 | const char *from = NULL; | 1687 | const char *from = NULL; |