struct neonserv_cmd_search_criteria {
char *name;
char *registrar;
+ char *onchan;
unsigned int flags : 16;
unsigned int unvisited;
unsigned int registered;
}
if(!stricmp(argv[i], "name")) criteria->name = argv[i+1];
else if(!stricmp(argv[i], "registrar")) criteria->registrar = argv[i+1];
+ else if(!stricmp(argv[i], "onchan")) criteria->onchan = argv[i+1];
else if(!stricmp(argv[i], "unvisited")) criteria->unvisited = strToTime(user, argv[i+1]);
else if(!stricmp(argv[i], "registered")) criteria->registered = strToTime(user, argv[i+1]);
else if(!stricmp(argv[i], "flags")) {
if((criteria->flags & CMD_SEARCH_FLAG_NOT_NODELETE) && strcmp(row[3], "0")) continue;
if((criteria->flags & CMD_SEARCH_FLAG_HAS_SUSPENDED) && strcmp(row[4], "1")) continue;
if((criteria->flags & CMD_SEARCH_FLAG_NOT_SUSPENDED) && strcmp(row[4], "0")) continue;
- if(criteria->flags & CMD_SEARCH_FLAG_STATES) {
+ if((criteria->flags & CMD_SEARCH_FLAG_STATES) || criteria->onchan) {
struct ChanNode *channel = getChanByName(row[0]);
+ if(criteria->onchan) {
+ if(!channel) continue;
+ struct ChanUser *chanuser = NULL;
+ for(chanuser = getChannelUsers(channel, NULL); chanuser; chanuser = getChannelUsers(channel, chanuser)) {
+ if(!match(criteria->onchan, chanuser->user->nick)) break;
+ }
+ if(!chanuser) continue;
+ }
if((criteria->flags & CMD_SEARCH_FLAG_IS_JOINED) && !channel) continue;
if((criteria->flags & CMD_SEARCH_FLAG_NOT_JOINED) && channel) continue;
if(channel && (criteria->flags & (CMD_SEARCH_FLAG_IS_OPPED | CMD_SEARCH_FLAG_NOT_OPPED | CMD_SEARCH_FLAG_IS_VOICED | CMD_SEARCH_FLAG_NOT_VOICED))) {