/*
* InspIRCd -- Internet Relay Chat Daemon
*
- * Copyright (C) 2018 Peter Powell <petpow@saberuk.com>
- * Copyright (C) 2014 Adam <Adam@anope.org>
+ * Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ * Copyright (C) 2017-2019 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2017-2018 Adam <Adam@anope.org>
+ * Copyright (C) 2013-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- * Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2009 John Brooks <special@inspircd.org>
+ * Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2007-2008, 2010 Craig Edwards <brain@inspircd.org>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
*
* This file is part of InspIRCd. InspIRCd is free software: you can
* redistribute it and/or modify it under the terms of the GNU General Public
struct WhoData : public Who::Request
{
- std::string query_flag_order;
-
- bool GetFlagIndex(char flag, size_t& out) const CXX11_OVERRIDE
+ bool GetFieldIndex(char flag, size_t& out) const CXX11_OVERRIDE
{
- out = query_flag_order.find(flag);
- return out != std::string::npos;
+ if (!whox)
+ {
+ const char* pos = strchr(who_field_order, flag);
+ if (pos == NULL)
+ return false;
+
+ out = pos - who_field_order;
+ return true;
+ }
+
+ if (!whox_fields[flag])
+ return false;
+
+ out = 0;
+ for (const char* c = whox_field_order; *c && *c != flag; ++c)
+ {
+ if (whox_fields[*c])
+ ++out;
+ }
+
+ return whox_field_order[out];
}
WhoData(const CommandBase::Params& parameters)
current_bitset->set(chr);
}
}
-
- if (whox)
- {
- for (const char *c = whox_field_order; c; c++)
- {
- if (whox_fields[*c])
- query_flag_order.push_back(*c);
- }
- }
- else
- query_flag_order = who_field_order;
}
};