summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/modules.h5
-rw-r--r--src/cmd_topic.cpp2
-rw-r--r--src/modules.cpp5
3 files changed, 1 insertions, 11 deletions
diff --git a/include/modules.h b/include/modules.h
index 5b5b177a4..7bc4d3d4c 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -1416,11 +1416,6 @@ class Server : public classbase
*/
virtual std::string ChanMode(userrec* User, chanrec* Chan);
- /** Checks if a user is on a channel.
- * This function will return true or false to indicate if user 'User' is on channel 'Chan'.
- */
- virtual bool IsOnChannel(userrec* User, chanrec* Chan);
-
/** Returns the server name of the server where the module is loaded.
*/
virtual std::string GetServerName();
diff --git a/src/cmd_topic.cpp b/src/cmd_topic.cpp
index 9de8637b4..463184de7 100644
--- a/src/cmd_topic.cpp
+++ b/src/cmd_topic.cpp
@@ -98,7 +98,7 @@ void cmd_topic::Handle (char **parameters, int pcnt, userrec *user)
{
if (IS_LOCAL(user))
{
- if ((Ptr) && (!has_channel(user,Ptr)))
+ if (!Ptr->HasUser(user))
{
WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, Ptr->name);
return;
diff --git a/src/modules.cpp b/src/modules.cpp
index d7525a519..f5129c837 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -631,11 +631,6 @@ std::string Server::ChanMode(userrec* User, chanrec* Chan)
return cmode(User,Chan);
}
-bool Server::IsOnChannel(userrec* User, chanrec* Chan)
-{
- return has_channel(User,Chan);
-}
-
std::string Server::GetServerName()
{
return Config->ServerName;