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 /data.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 'data.c')
| -rw-r--r-- | data.c | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -2577,7 +2577,7 @@ xs_list *content_search(snac *user, const char *regex, | |||
| 2577 | if (!valid_status(timeline_get_by_md5(user, md5, &post))) | 2577 | if (!valid_status(timeline_get_by_md5(user, md5, &post))) |
| 2578 | continue; | 2578 | continue; |
| 2579 | 2579 | ||
| 2580 | if (!xs_match(xs_dict_get_def(post, "type", "-"), "Note|Question|Page|Article|Video")) | 2580 | if (!xs_match(xs_dict_get_def(post, "type", "-"), POSTLIKE_OBJECT_TYPE)) |
| 2581 | continue; | 2581 | continue; |
| 2582 | 2582 | ||
| 2583 | char *content = xs_dict_get(post, "content"); | 2583 | char *content = xs_dict_get(post, "content"); |