diff options
| -rw-r--r-- | data.c | 107 | ||||
| -rw-r--r-- | main.c | 18 | ||||
| -rw-r--r-- | snac.h | 2 |
3 files changed, 127 insertions, 0 deletions
| @@ -2488,6 +2488,113 @@ void notify_clear(snac *snac) | |||
| 2488 | } | 2488 | } |
| 2489 | 2489 | ||
| 2490 | 2490 | ||
| 2491 | /** searches **/ | ||
| 2492 | |||
| 2493 | xs_list *content_search(snac *user, const char *regex, int priv, int max_secs, int *timeout) | ||
| 2494 | /* returns a list of posts which content matches the regex */ | ||
| 2495 | { | ||
| 2496 | xs_set seen; | ||
| 2497 | |||
| 2498 | xs_set_init(&seen); | ||
| 2499 | |||
| 2500 | if (max_secs == 0) | ||
| 2501 | max_secs = 3; | ||
| 2502 | |||
| 2503 | time_t t = time(NULL) + max_secs; | ||
| 2504 | *timeout = 0; | ||
| 2505 | |||
| 2506 | /* iterate both timelines simultaneously */ | ||
| 2507 | xs *pub_tl = timeline_simple_list(user, "public", 0, XS_ALL); | ||
| 2508 | int pub_c = 0; | ||
| 2509 | char *pub_md5 = NULL; | ||
| 2510 | |||
| 2511 | xs *priv_tl = priv ? timeline_simple_list(user, "private", 0, XS_ALL) : xs_list_new(); | ||
| 2512 | int priv_c = 0; | ||
| 2513 | char *priv_md5 = NULL; | ||
| 2514 | |||
| 2515 | /* first positioning */ | ||
| 2516 | xs_list_next(pub_tl, &pub_md5, &pub_c); | ||
| 2517 | xs_list_next(priv_tl, &priv_md5, &priv_c); | ||
| 2518 | |||
| 2519 | for (;;) { | ||
| 2520 | char *md5 = NULL; | ||
| 2521 | enum { NONE, PUBLIC, PRIVATE } from = NONE; | ||
| 2522 | |||
| 2523 | /* timeout? */ | ||
| 2524 | if (time(NULL) > t) { | ||
| 2525 | *timeout = 1; | ||
| 2526 | break; | ||
| 2527 | } | ||
| 2528 | |||
| 2529 | if (pub_md5 == NULL) { | ||
| 2530 | /* out of both lists? done */ | ||
| 2531 | if (priv_md5 == NULL) | ||
| 2532 | break; | ||
| 2533 | |||
| 2534 | /* out of public: take element from the private timeline and advance */ | ||
| 2535 | from = PRIVATE; | ||
| 2536 | } | ||
| 2537 | else | ||
| 2538 | if (priv_md5 == NULL) { | ||
| 2539 | /* out of private: take element from the public timeline and advance */ | ||
| 2540 | from = PUBLIC; | ||
| 2541 | } | ||
| 2542 | else { | ||
| 2543 | /* candidates from both: choose one from the file dates */ | ||
| 2544 | xs *pub_fn = xs_fmt("%s/public/%s.json", user->basedir, pub_md5); | ||
| 2545 | xs *priv_fn = xs_fmt("%s/private/%s.json", user->basedir, priv_md5); | ||
| 2546 | |||
| 2547 | if (mtime(pub_fn) < mtime(priv_fn)) | ||
| 2548 | from = PRIVATE; | ||
| 2549 | else | ||
| 2550 | from = PUBLIC; | ||
| 2551 | } | ||
| 2552 | |||
| 2553 | if (from == PUBLIC) { /* public */ | ||
| 2554 | md5 = pub_md5; | ||
| 2555 | if (!xs_list_next(pub_tl, &pub_md5, &pub_c)) | ||
| 2556 | pub_md5 = NULL; | ||
| 2557 | } | ||
| 2558 | else | ||
| 2559 | if (from == PRIVATE) { /* private */ | ||
| 2560 | md5 = priv_md5; | ||
| 2561 | if (!xs_list_next(priv_tl, &priv_md5, &priv_c)) | ||
| 2562 | priv_md5 = NULL; | ||
| 2563 | } | ||
| 2564 | |||
| 2565 | if (md5 == NULL) | ||
| 2566 | break; | ||
| 2567 | |||
| 2568 | xs *post = NULL; | ||
| 2569 | |||
| 2570 | if (!valid_status(timeline_get_by_md5(user, md5, &post))) | ||
| 2571 | continue; | ||
| 2572 | |||
| 2573 | /* must be a Note */ | ||
| 2574 | if (strcmp(xs_dict_get_def(post, "type", ""), "Note")) | ||
| 2575 | continue; | ||
| 2576 | |||
| 2577 | char *content = xs_dict_get(post, "content"); | ||
| 2578 | |||
| 2579 | if (xs_is_null(content)) | ||
| 2580 | continue; | ||
| 2581 | |||
| 2582 | /* strip HTML */ | ||
| 2583 | xs *c = xs_regex_replace(content, "<[^>]+>", " "); | ||
| 2584 | c = xs_regex_replace_i(c, " {2,}", " "); | ||
| 2585 | c = xs_tolower_i(c); | ||
| 2586 | |||
| 2587 | /* apply regex */ | ||
| 2588 | xs *l = xs_regex_select_n(c, regex, 1); | ||
| 2589 | |||
| 2590 | if (xs_list_len(l)) | ||
| 2591 | xs_set_add(&seen, md5); | ||
| 2592 | } | ||
| 2593 | |||
| 2594 | return xs_set_result(&seen); | ||
| 2595 | } | ||
| 2596 | |||
| 2597 | |||
| 2491 | /** the queue **/ | 2598 | /** the queue **/ |
| 2492 | 2599 | ||
| 2493 | static xs_dict *_enqueue_put(const char *fn, xs_dict *msg) | 2600 | static xs_dict *_enqueue_put(const char *fn, xs_dict *msg) |
| @@ -44,6 +44,7 @@ int usage(void) | |||
| 44 | printf("limit {basedir} {uid} {actor} Limits an actor (drops their announces)\n"); | 44 | printf("limit {basedir} {uid} {actor} Limits an actor (drops their announces)\n"); |
| 45 | printf("unlimit {basedir} {uid} {actor} Unlimits an actor\n"); | 45 | printf("unlimit {basedir} {uid} {actor} Unlimits an actor\n"); |
| 46 | printf("verify_links {basedir} {uid} Verifies a user's links (in the metadata)\n"); | 46 | printf("verify_links {basedir} {uid} Verifies a user's links (in the metadata)\n"); |
| 47 | printf("search {basedir} {uid} {regex} Searches posts by content\n"); | ||
| 47 | 48 | ||
| 48 | return 1; | 49 | return 1; |
| 49 | } | 50 | } |
| @@ -374,6 +375,23 @@ int main(int argc, char *argv[]) | |||
| 374 | return 0; | 375 | return 0; |
| 375 | } | 376 | } |
| 376 | 377 | ||
| 378 | if (strcmp(cmd, "search") == 0) { /** **/ | ||
| 379 | int to; | ||
| 380 | |||
| 381 | /* 'url' contains the regex */ | ||
| 382 | xs *r = content_search(&snac, url, 1, 10, &to); | ||
| 383 | |||
| 384 | int c = 0; | ||
| 385 | char *v; | ||
| 386 | |||
| 387 | /* print results as standalone links */ | ||
| 388 | while (xs_list_next(r, &v, &c)) { | ||
| 389 | printf("%s/admin/p/%s\n", snac.actor, v); | ||
| 390 | } | ||
| 391 | |||
| 392 | return 0; | ||
| 393 | } | ||
| 394 | |||
| 377 | if (strcmp(cmd, "ping") == 0) { /** **/ | 395 | if (strcmp(cmd, "ping") == 0) { /** **/ |
| 378 | xs *actor_o = NULL; | 396 | xs *actor_o = NULL; |
| 379 | 397 | ||
| @@ -179,6 +179,8 @@ xs_list *list_timeline(snac *user, const char *list, int skip, int show); | |||
| 179 | xs_val *list_content(snac *user, const char *list_id, const char *actor_md5, int op); | 179 | xs_val *list_content(snac *user, const char *list_id, const char *actor_md5, int op); |
| 180 | void list_distribute(snac *user, const char *who, const xs_dict *post); | 180 | void list_distribute(snac *user, const char *who, const xs_dict *post); |
| 181 | 181 | ||
| 182 | xs_list *content_search(snac *user, const char *regex, int priv, int max_secs, int *timeout); | ||
| 183 | |||
| 182 | int actor_add(const char *actor, xs_dict *msg); | 184 | int actor_add(const char *actor, xs_dict *msg); |
| 183 | int actor_get(const char *actor, xs_dict **data); | 185 | int actor_get(const char *actor, xs_dict **data); |
| 184 | int actor_get_refresh(snac *user, const char *actor, xs_dict **data); | 186 | int actor_get_refresh(snac *user, const char *actor, xs_dict **data); |