commit 34c8968

Minor tweaks to content_search().

 1@@ -2491,7 +2491,7 @@ void notify_clear(snac *snac)
 2 /** searches **/
 3 
 4 xs_list *content_search(snac *user, const xs_list *timeline,
 5-                            const char *regex, int max_secs, int *timeout)
 6+                        const char *regex, int max_secs, int *timeout)
 7 /* returns a list of posts which content matches the regex */
 8 {
 9     xs_list *r = xs_list_new();
10@@ -2514,14 +2514,11 @@ xs_list *content_search(snac *user, const xs_list *timeline,
11             break;
12         }
13 
14-        int status;
15-
16-        if (user)
17-            status = timeline_get_by_md5(user, v, &post);
18-        else
19-            status = object_get_by_md5(v, &post);
20+        /* if from a user, must be in any timeline */
21+        if (user && !timeline_here(user, v))
22+            continue;
23 
24-        if (!valid_status(status))
25+        if (!valid_status(object_get_by_md5(v, &post)))
26             continue;
27 
28         /* must be a Note */