diff options
| author | Sadie Powell <sadie@witchery.services> | 2020-05-26 16:29:13 +0100 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2020-05-29 16:58:56 +0100 |
| commit | 3c30de43c945a387a7faf5d49ce320f8bcaa5c43 (patch) | |
| tree | bc8a1c0d18dcff2b589a6dc0c1d2ae884cbfa2b6 | |
| parent | 8deed905c2f5231a212816034d30581aeac8f845 (diff) | |
Use ChanModeReference for finding the op mode in ojoin.
| -rw-r--r-- | src/modules/m_ojoin.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp index 20ac41685..8bc264622 100644 --- a/src/modules/m_ojoin.cpp +++ b/src/modules/m_ojoin.cpp @@ -33,9 +33,11 @@ class CommandOjoin : public SplitCommand bool notice; bool op; ModeHandler* npmh; + ChanModeReference opmode; CommandOjoin(Module* parent, ModeHandler& mode) : SplitCommand(parent, "OJOIN", 1) , npmh(&mode) + , opmode(parent, "op") { flags_needed = 'o'; syntax = "<channel>"; @@ -73,8 +75,8 @@ class CommandOjoin : public SplitCommand // they're already in the channel Modes::ChangeList changelist; changelist.push_add(npmh, user->nick); - if (op) - changelist.push_add(ServerInstance->Modes->FindMode('o', MODETYPE_CHANNEL), user->nick); + if (op && opmode) + changelist.push_add(*opmode, user->nick); ServerInstance->Modes->Process(ServerInstance->FakeClient, channel, NULL, changelist); } return CMD_SUCCESS; @@ -121,8 +123,8 @@ class ModuleOjoin : public Module if (mycommand.active) { privs += np.GetModeChar(); - if (mycommand.op) - privs += 'o'; + if (mycommand.op && mycommand.opmode) + privs += mycommand.opmode->IsPrefixMode()->GetPrefix(); return MOD_RES_ALLOW; } |