da3e8e4726
Fix a bug with searches like the following not working correctly: * https://danbooru.donmai.us/comments.json?search[creator][level]=20&search[creator_id]=1234 * https://danbooru.donmai.us/comments.json?search[creator][level]=20&search[creator_name]=abcd * https://danbooru.donmai.us/comments.json?search[post][rating]=s&search[post_tags_match]=touhou It wasn't possible to search for both `creator` and `creator_id` at the same time (or `post` and `post_tags_match`, etc). Only the `creator_id` param would be recognized. Also refactor some internals: * `search_includes` was renamed to `search_associated_attribute`. * `search_attribute` was split up into `search_basic_attribute` and `search_associated_attribute`.