diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2015-12-06 12:01:02 +0100 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2015-12-06 12:01:02 +0100 |
| commit | 7343ac33fbc64fd6d4426da4203530c3aef95e29 (patch) | |
| tree | e3c90bc5a3d54021ad95a72b2685d7d2f6f211f5 /include | |
| parent | e4b17fd39b476fefec73d0956e6f40bd7ec254fc (diff) | |
| parent | f9f59c2706f965f7f753271f54536cf0531a2ba8 (diff) | |
Merge branch 'master+echomessage-invitenotify'
Diffstat (limited to 'include')
| -rw-r--r-- | include/configreader.h | 5 | ||||
| -rw-r--r-- | include/modules.h | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/include/configreader.h b/include/configreader.h index 9b73dd3c6..fe1e5da9e 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -431,11 +431,6 @@ class CoreExport ServerConfig */ bool CycleHostsFromUser; - /** If set to true, prefixed channel NOTICEs and PRIVMSGs will have the prefix - * added to the outgoing text for undernet style msg prefixing. - */ - bool UndernetMsgPrefix; - /** If set to true, the full nick!user\@host will be shown in the TOPIC command * for who set the topic last. If false, only the nick is shown. */ diff --git a/include/modules.h b/include/modules.h index 93e5c05a0..526c283b2 100644 --- a/include/modules.h +++ b/include/modules.h @@ -487,8 +487,10 @@ class CoreExport Module : public classbase, public usecountbase * @param dest The user being invited * @param channel The channel the user is being invited to * @param timeout The time the invite will expire (0 == never) + * @param notifyrank Rank required to get an invite announcement (if enabled) + * @param notifyexcepts List of users to not send the default NOTICE invite announcement to */ - virtual void OnUserInvite(User* source,User* dest,Channel* channel, time_t timeout); + virtual void OnUserInvite(User* source, User* dest, Channel* channel, time_t timeout, unsigned int notifyrank, CUList& notifyexcepts); /** Called whenever a user is about to PRIVMSG A user or a channel, before any processing is done. * Returning any nonzero value from this function stops the process immediately, causing no |