Commit Graph

4137 Commits

Author SHA1 Message Date
J-P Nurmi
320abef756 Merge CChanMessage & CPrivMessage to... CTextMessage
This naming is a bit hairy. I chose CTextMessage because this type of
message carries a text argument. Alternatively, it could be also called
CPrivateMessage, because the IRC protocol calls it PRIVMSG. On the other
hand, ZNC module hooks use the "Priv" naming convention for private
messages. It would look a bit weird to have OnChanMsg(CPrivMessage)...

More details and reasoning of the merge in the previous commit message.
2015-08-30 15:50:12 +02:00
J-P Nurmi
3976651c35 Merge CChan+PrivAction, CChan+PrivCTCP, CChan+PrivNotice
OnUserAction(), OnUserCTCP(), and OnUserNotice() don't separate private
private and channel messages. A module could even redirect a message by
modifying its target, so technically, if they were two distinct types,
the type of a message could change on the way.

The original reason for the separation was that at some point during
CMessage development, GetChan() didn't exist in CPrivXxx, but only in
CChanXxx message types. To achieve cleaner implementation, the getter
was later promoted to CMessage and made return nullptr for non-channel
specific messages. From this point of view, the separation is also no
longer necessary since the CPrivXxx and CChanXxx types are API-wise
identical with each other.
2015-08-30 15:50:12 +02:00
Alexey Sokolov
8f655ac179 Merge pull request #1050 from Mkaysi/contributing
CONTRIBUTING.md: ask for unmodified ZNC
2015-08-30 13:51:40 +01:00
Mikaela Suomalainen
6ef189d397 CONTRIBUTING.md: ask for unmodified ZNC
Specify unmodified ZNC in case the issue is caused by modified ZNC (such
as
the SSL certificate validation check removal or firre webadmin theme
(see znc/znc#384 where after fixing patches have reintroduced it)).

<s>Thanks to @kerio92 & @Zarthus for wording suggestions.</s>
DarthGandalf reworded it.

[CI SKIP]
2015-08-30 15:49:01 +03:00
J-P Nurmi
068d5af719 Merge branch '1.6.x' 2015-08-29 21:16:33 +02:00
J-P Nurmi
d2c462ae03 Fix yet another startup failure with awaynick & simple_away
The detection whether simple_away is already on the list of loaded
modules failed when the simple_away load line contained arguments.

Close #954
2015-08-29 21:13:52 +02:00
Alexey Sokolov
eac0af1d7b Travis: in last commit I reordered 2 builds for some reason... Fix it.
[skip ci]
2015-08-28 22:51:11 +01:00
Alexey Sokolov
30dab0e911 Travis: try to simplify matrix config
[skip appveyor]
2015-08-28 22:02:16 +01:00
Alexey Sokolov
ceb1c5ec27 Move test which requires modules to be installed to a separate target 2015-08-27 23:05:08 +01:00
J-P Nurmi
0ecc0d464f Make params optiona for the CMessage(CNick, CString, ...) ctor
Also fixes the build for Clang <= 3.4, broken by 9a7df7c.
2015-08-27 13:21:45 +02:00
J-P Nurmi
37cd61a667 Fix CMessage to prefix also empty last params with a colon 2015-08-27 12:33:47 +02:00
J-P Nurmi
9a7df7cbbe MessageTest: test also CMessage(CNick, CString, ...) 2015-08-27 12:31:57 +02:00
Alexey Sokolov
bfc91dde40 Travis: run make test after make install 2015-08-27 00:29:38 +01:00
Alexey Sokolov
2124aacd11 Travis: --base-directory isn't really needed for lcov
[skip appveyor]
2015-08-27 00:20:55 +01:00
Alexey Sokolov
c8a89ec432 Open modules during make test. 2015-08-27 00:16:35 +01:00
Alexey Sokolov
b83f32fdcb Travis: Fix coverage build. Now it finally works.
[skip appveyor]
2015-08-26 23:10:40 +01:00
Alexey Sokolov
aafc06e793 Travis: fix typo 2015-08-25 23:28:28 +01:00
Alexey Sokolov
c0e1b09e8e Travis: use gcc for coverage instead of clang 2015-08-25 23:21:45 +01:00
Alexey Sokolov
06e52945b7 Travis: coverage should be gathered from the right directory 2015-08-25 22:47:07 +01:00
Alexey Sokolov
c1de36a0a5 Enable test coverage in travis+coveralls 2015-08-25 22:35:33 +01:00
Alexey Sokolov
9688727f32 Add a possibility (not an "option") to disable launch after --makeconf
See #257
2015-08-24 21:22:14 +01:00
Andreas Lutro
3a3155f9d5 make adminlog path customizable
Close #1001
2015-08-24 20:12:15 +01:00
Alexey Sokolov
f63c3131eb Add AppVeyor and Bountysource badges to top of readme...
Close #574
2015-08-23 23:26:53 +01:00
reality
c95621dc48 Extend awaystore with -chans option, which records channel hilights to the awaystore as well as only PMs.
Close #851
2015-08-23 22:33:55 +01:00
Toon Schoenmakers
03e3920ced Add options for log module to hide joins, quits and nick changes.
Fix #601
Close #613
2015-08-23 21:20:36 +01:00
Alexey Sokolov
1a574f95ae Merge pull request #978 from alprs/log-timestamp
log: Add -timestamp option (cont.)
2015-08-23 20:38:42 +01:00
Andreas Lutro
c2201a59d6 work on log module argument parsing 2015-08-23 20:17:44 +02:00
Paulo Flabiano Smorigo
c223c851e1 Use prefix from autoconf for systemd unit
Close #974
2015-08-23 18:37:51 +01:00
Alexey Sokolov
baa51aa4b8 Merge branch 'pyeval' 2015-08-23 18:20:41 +01:00
Alexey Sokolov
e8d9cb8fbd AppVeyor: 7z doesn't like c:/ 2015-08-23 18:20:23 +01:00
Alexey Sokolov
01c73ff5f0 Move pyeval module to the right place.
Also make 'network' work better when pyeval is a user module.
2015-08-23 18:18:25 +01:00
Alexey Sokolov
bdc4a77eda AppVeyor: cache gtest 2015-08-23 17:43:39 +01:00
J-P Nurmi
b556a4b27b Merge pull request #1042 from jpnurmi/1040
Fix #1040: recent CMessage changes break modules
2015-08-23 17:13:19 +03:00
J-P Nurmi
478f1952b7 Fix #1040: recent CMessage changes break modules 2015-08-23 12:48:17 +02:00
Alexey Sokolov
672e8c5731 Add OnRawMessage() 2015-08-23 00:52:27 +01:00
J-P Nurmi
e1ae565e6f Fix GetText() for CTCP [ACTION]
Just like the recent problem with smileys; TrimLeft() is not the same
than TrimPrefix(), and TrimRight() is not the same than TrimSuffix().
2015-08-23 00:48:35 +02:00
Alexey Sokolov
6e15ee2eea In last commit I forgot to remove LIBZNC_VERSION from exports of configure.ac 2015-08-22 13:12:28 +01:00
Alexey Sokolov
e93b029a3a Link modules against libznc.dll.a on cygwin instead of cygznc-1.7.dll, as it's being built now anyway. 2015-08-22 13:05:57 +01:00
Alexey Sokolov
4aba9fed17 Fix znc-buildmod on cygwin when installed to not /usr
1. Use import library, so don't require -L/bin anymore
2. Move -lznc from LDFLAGS to LIBS
3. Fix variables in znc-buildmod. It worked before only because
   ${exec_prefix} was resolving to empty string, and /bin == /usr/bin on
   cygwin.
2015-08-22 12:42:28 +01:00
Alexey Sokolov
786d94fbe4 Install Csocket.h even when building out of tree 2015-08-22 12:39:47 +01:00
J-P Nurmi
2ad2ee5620 Bring back the smileys - part II 2015-08-22 11:54:33 +02:00
J-P Nurmi
b402c1e582 Merge branch '1.6.x'
Conflicts:
	src/IRCSock.cpp
2015-08-22 00:18:55 +02:00
J-P Nurmi
263f278a11 Merge pull request #1026 from jpnurmi/perms
Fix #124: OnChanMsg(): nick doesn't have perms
2015-08-22 01:14:48 +03:00
J-P Nurmi
918a8a1c3e Merge pull request #1038 from jpnurmi/eyes
Bring back the eyes

Even though eyeless Russian smileys are neat, like, much cooler than
those childish winky winky blinky ;) ones et cetera, it seems unfair
to cut out eyes from everyone's smileys.
2015-08-22 01:12:37 +03:00
J-P Nurmi
b8088a5b02 Fix CMessage::ToString() to ':' -prefix the last param when appropriate
Close #1037
2015-08-21 22:08:16 +02:00
Alexey Sokolov
e546cedaa2 Merge pull request #1035 from jpnurmi/server-time
Make ZNC request server-time when available (close #839)
2015-08-20 22:31:24 +01:00
J-P Nurmi
2e85eff2fd CQuery: fix buffer playback
A regression caused by d0a58ff. Unlike for CChan, from which the
snippet was copy-pasted, for CQuery the params actually need to be
passed. Otherwise buffer playback PRIVMSGs have empty target nick.
2015-08-18 12:59:21 +02:00
J-P Nurmi
1f11b10b70 Make ZNC request server-time when available (close #839) 2015-08-18 01:42:42 +02:00
Alexey Sokolov
abda566073 Merge pull request #1034 from jpnurmi/bindhost
Remove flawed Add/Del/List/BindHost(s) (close #983)
2015-08-17 23:50:44 +01:00
Alexey Sokolov
7f87e51f37 Merge pull request #1033 from Mkaysi/contributing
add simple CONTRIBUTING.md
2015-08-17 23:49:46 +01:00