Skip to content

Commit e85284f

Browse files
mbaxmbax
committed
Rename getOriginalMessage(s) to getSource
1 parent 468281d commit e85284f

26 files changed

+62
-62
lines changed

‎src/main/java/org/kitteh/irc/client/library/defaults/listener/AbstractDefaultListenerBase.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ protected void ctcp(ClientReceiveCommandEvent event) {
9595
switch (event.getCommand()) {
9696
case "NOTICE":
9797
if (messageTargetInfo instanceof MessageTargetInfo.Private) {
98-
this.fire(new PrivateCtcpReplyEvent(this.getClient(), event.getOriginalMessage(), user, event.getParameters().get(0), ctcpMessage));
98+
this.fire(new PrivateCtcpReplyEvent(this.getClient(), event.getSource(), user, event.getParameters().get(0), ctcpMessage));
9999
}
100100
break;
101101
case "PRIVMSG":
@@ -115,18 +115,18 @@ protected void ctcp(ClientReceiveCommandEvent event) {
115115
if (ctcpMessage.startsWith("PING ")) {
116116
reply = ctcpMessage;
117117
}
118-
PrivateCtcpQueryEvent ctcpEvent = new PrivateCtcpQueryEvent(this.getClient(), event.getOriginalMessage(), user, event.getParameters().get(0), ctcpMessage, reply);
118+
PrivateCtcpQueryEvent ctcpEvent = new PrivateCtcpQueryEvent(this.getClient(), event.getSource(), user, event.getParameters().get(0), ctcpMessage, reply);
119119
this.fire(ctcpEvent);
120120
Optional<String> replyMessage = ctcpEvent.getReply();
121121
if (ctcpEvent.isToClient()) {
122122
replyMessage.ifPresent(message -> this.getClient().sendRawLine("NOTICE " + user.getNick() + " :" + CtcpUtil.toCtcp(message)));
123123
}
124124
} else if (messageTargetInfo instanceof MessageTargetInfo.ChannelInfo) {
125125
MessageTargetInfo.ChannelInfo channelInfo = (MessageTargetInfo.ChannelInfo) messageTargetInfo;
126-
this.fire(new ChannelCtcpEvent(this.getClient(), event.getOriginalMessage(), user, channelInfo.getChannel(), ctcpMessage));
126+
this.fire(new ChannelCtcpEvent(this.getClient(), event.getSource(), user, channelInfo.getChannel(), ctcpMessage));
127127
} else if (messageTargetInfo instanceof MessageTargetInfo.TargetedChannel) {
128128
MessageTargetInfo.TargetedChannel channelInfo = (MessageTargetInfo.TargetedChannel) messageTargetInfo;
129-
this.fire(new ChannelTargetedCtcpEvent(this.getClient(), event.getOriginalMessage(), user, channelInfo.getChannel(), channelInfo.getPrefix(), ctcpMessage));
129+
this.fire(new ChannelTargetedCtcpEvent(this.getClient(), event.getSource(), user, channelInfo.getChannel(), channelInfo.getPrefix(), ctcpMessage));
130130
}
131131
break;
132132
}

‎src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultAccountListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void account(ClientReceiveCommandEvent event) {
5757
}
5858
String accountParameter = event.getParameters().get(0);
5959
String accountName = "*".equals(accountParameter) ? null : accountParameter;
60-
this.fire(new UserAccountStatusEvent(this.getClient(), event.getOriginalMessage(), (User) event.getActor(), accountName));
60+
this.fire(new UserAccountStatusEvent(this.getClient(), event.getSource(), (User) event.getActor(), accountName));
6161
this.getTracker().setUserAccount(((User) event.getActor()).getNick(), accountName);
6262
}
6363
}

‎src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultAwayListener.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public DefaultAwayListener(Client.@NonNull WithManagement client) {
5252
@NumericFilter(306) // NOWAWAY
5353
@Handler(priority = Integer.MAX_VALUE - 1)
5454
public void away(ClientReceiveNumericEvent event) {
55-
this.fire(new ClientAwayStatusChangeEvent(this.getClient(), event.getOriginalMessage(), event.getNumeric() == 306));
55+
this.fire(new ClientAwayStatusChangeEvent(this.getClient(), event.getSource(), event.getNumeric() == 306));
5656
}
5757

5858
@CommandFilter("AWAY")
@@ -63,7 +63,7 @@ public void away(ClientReceiveCommandEvent event) {
6363
return;
6464
}
6565
String awayMessage = event.getParameters().isEmpty() ? null : StringUtil.combineSplit(event.getParameters().toArray(new String[event.getParameters().size()]), 0);
66-
this.fire(new UserAwayMessageEvent(this.getClient(), event.getOriginalMessage(), (User) event.getActor(), awayMessage));
66+
this.fire(new UserAwayMessageEvent(this.getClient(), event.getSource(), (User) event.getActor(), awayMessage));
6767
this.getTracker().setUserAway(((User) event.getActor()).getNick(), awayMessage);
6868
}
6969
}

‎src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultCapListener.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void cap(ClientReceiveCommandEvent event) {
9191
switch (event.getParameters().get(1).toLowerCase()) {
9292
case "ack":
9393
this.getClient().getCapabilityManager().updateCapabilities(capabilityStateList);
94-
responseEvent = new CapabilitiesAcknowledgedEvent(this.getClient(), event.getOriginalMessage(), this.getClient().getCapabilityManager().isNegotiating(), capabilityStateList);
94+
responseEvent = new CapabilitiesAcknowledgedEvent(this.getClient(), event.getSource(), this.getClient().getCapabilityManager().isNegotiating(), capabilityStateList);
9595
this.fire(responseEvent);
9696
break;
9797
case "list":
@@ -131,21 +131,21 @@ public void cap(ClientReceiveCommandEvent event) {
131131
break;
132132
case "nak":
133133
this.getClient().getCapabilityManager().updateCapabilities(capabilityStateList);
134-
responseEvent = new CapabilitiesRejectedEvent(this.getClient(), event.getOriginalMessage(), this.getClient().getCapabilityManager().isNegotiating(), capabilityStateList);
134+
responseEvent = new CapabilitiesRejectedEvent(this.getClient(), event.getSource(), this.getClient().getCapabilityManager().isNegotiating(), capabilityStateList);
135135
this.fire(responseEvent);
136136
break;
137137
case "new":
138138
List<CapabilityState> statesAdded = new ArrayList<>(this.getClient().getCapabilityManager().getSupportedCapabilities());
139139
statesAdded.addAll(capabilityStateList);
140140
this.getClient().getCapabilityManager().setSupportedCapabilities(statesAdded);
141-
responseEvent = new CapabilitiesNewSupportedEvent(this.getClient(), event.getOriginalMessage(), this.getClient().getCapabilityManager().isNegotiating(), capabilityStateList);
141+
responseEvent = new CapabilitiesNewSupportedEvent(this.getClient(), event.getSource(), this.getClient().getCapabilityManager().isNegotiating(), capabilityStateList);
142142
this.fireAndCapReq((CapabilitiesNewSupportedEvent) responseEvent);
143143
break;
144144
case "del":
145145
List<CapabilityState> statesRemaining = new ArrayList<>(this.getClient().getCapabilityManager().getSupportedCapabilities());
146146
statesRemaining.removeAll(capabilityStateList);
147147
this.getClient().getCapabilityManager().setSupportedCapabilities(statesRemaining);
148-
responseEvent = new CapabilitiesDeletedSupportedEvent(this.getClient(), event.getOriginalMessage(), this.getClient().getCapabilityManager().isNegotiating(), capabilityStateList);
148+
responseEvent = new CapabilitiesDeletedSupportedEvent(this.getClient(), event.getSource(), this.getClient().getCapabilityManager().isNegotiating(), capabilityStateList);
149149
this.fire(responseEvent);
150150
break;
151151
}

‎src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultChgHostListener.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ public void chghost(ClientReceiveCommandEvent event) {
7575

7676
if (!user.getHost().equals(newHostString)) {
7777
this.getTracker().trackUserHostnameChange(user.getNick(), newHostString);
78-
this.fire(new UserHostnameChangeEvent(this.getClient(), event.getOriginalMessage(), oldUser, this.getTracker().getTrackedUser(user.getNick()).get()));
78+
this.fire(new UserHostnameChangeEvent(this.getClient(), event.getSource(), oldUser, this.getTracker().getTrackedUser(user.getNick()).get()));
7979
}
8080

8181
if (!user.getUserString().equals(newUserString)) {
8282
this.getTracker().trackUserUserStringChange(user.getNick(), newUserString);
83-
this.fire(new UserUserStringChangeEvent(this.getClient(), event.getOriginalMessage(), oldUser, this.getTracker().getTrackedUser(user.getNick()).get()));
83+
this.fire(new UserUserStringChangeEvent(this.getClient(), event.getSource(), oldUser, this.getTracker().getTrackedUser(user.getNick()).get()));
8484
}
8585
}
8686
}

‎src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultInviteListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void invite(ClientReceiveCommandEvent event) {
5858
if (this.getClient().getNick().equalsIgnoreCase(event.getParameters().get(0)) && this.getClient().getIntendedChannels().contains(channel.get().getName())) {
5959
this.getClient().sendRawLine("JOIN " + channel.get().getName());
6060
}
61-
this.fire(new ChannelInviteEvent(this.getClient(), event.getOriginalMessage(), channel.get(), event.getActor(), event.getParameters().get(0)));
61+
this.fire(new ChannelInviteEvent(this.getClient(), event.getSource(), channel.get(), event.getActor(), event.getParameters().get(0)));
6262
} else {
6363
this.trackException(event, "INVITE message sent for invalid channel name");
6464
}

‎src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultJoinListener.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void join(ClientReceiveCommandEvent event) {
6969
this.getClient().sendRawLine("WHO " + channelName + (this.getClient().getServerInfo().hasWhoXSupport() ? " %cuhsnfar" : ""));
7070
}
7171
if (this.getClient().getIntendedChannels().contains(channelName)) {
72-
joinEvent = new RequestedChannelJoinCompleteEvent(this.getClient(), event.getOriginalMessage(), channel, user);
72+
joinEvent = new RequestedChannelJoinCompleteEvent(this.getClient(), event.getSource(), channel, user);
7373
}
7474
}
7575
if (event.getParameters().size() > 2) {
@@ -79,7 +79,7 @@ public void join(ClientReceiveCommandEvent event) {
7979
this.getTracker().setUserRealName(user.getNick(), event.getParameters().get(2));
8080
}
8181
if (joinEvent == null) {
82-
joinEvent = new ChannelJoinEvent(this.getClient(), event.getOriginalMessage(), channel, user);
82+
joinEvent = new ChannelJoinEvent(this.getClient(), event.getSource(), channel, user);
8383
}
8484
this.fire(joinEvent);
8585
} else {

‎src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultKickListener.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ public void kick(ClientReceiveCommandEvent event) {
6464
ClientEvent kickEvent;
6565
String kickReason = (event.getParameters().size() > 2) ? event.getParameters().get(2) : "";
6666
if (isSelf && this.getClient().getIntendedChannels().contains(channel.get().getName())) {
67-
kickEvent = new UnexpectedChannelLeaveViaKickEvent(this.getClient(), event.getOriginalMessage(), channel.get(), event.getActor(), kickedUser.get(), kickReason);
67+
kickEvent = new UnexpectedChannelLeaveViaKickEvent(this.getClient(), event.getSource(), channel.get(), event.getActor(), kickedUser.get(), kickReason);
6868
} else {
69-
kickEvent = new ChannelKickEvent(this.getClient(), event.getOriginalMessage(), channel.get(), event.getActor(), kickedUser.get(), kickReason);
69+
kickEvent = new ChannelKickEvent(this.getClient(), event.getSource(), channel.get(), event.getActor(), kickedUser.get(), kickReason);
7070
}
7171
this.fire(kickEvent);
7272
this.getTracker().trackUserPart(channel.get().getName(), event.getParameters().get(1));

‎src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultKnockListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void knock(ClientReceiveNumericEvent event) {
5757
Optional<Channel> channel = this.getTracker().getChannel(event.getParameters().get(1));
5858
if (channel.isPresent()) {
5959
User user = (User) this.getTracker().getActor(event.getParameters().get(2));
60-
this.fire(new ChannelKnockEvent(this.getClient(), event.getOriginalMessage(), channel.get(), user));
60+
this.fire(new ChannelKnockEvent(this.getClient(), event.getSource(), channel.get(), user));
6161
} else {
6262
this.trackException(event, "KNOCK message sent for invalid channel name");
6363
}

‎src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultModeListener.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void mode(ClientReceiveCommandEvent event) {
9595
this.trackException(event, e.getMessage());
9696
return;
9797
}
98-
this.fire(new UserModeEvent(this.getClient(), event.getOriginalMessage(), event.getActor(), event.getParameters().get(0), statusList));
98+
this.fire(new UserModeEvent(this.getClient(), event.getSource(), event.getActor(), event.getParameters().get(0), statusList));
9999
this.getClient().updateUserModes(statusList);
100100
} else if (messageTargetInfo instanceof MessageTargetInfo.ChannelInfo) {
101101
Channel channel = ((MessageTargetInfo.ChannelInfo) messageTargetInfo).getChannel();
@@ -106,7 +106,7 @@ public void mode(ClientReceiveCommandEvent event) {
106106
this.trackException(event, e.getMessage());
107107
return;
108108
}
109-
this.fire(new ChannelModeEvent(this.getClient(), event.getOriginalMessage(), event.getActor(), channel, statusList));
109+
this.fire(new ChannelModeEvent(this.getClient(), event.getSource(), event.getActor(), channel, statusList));
110110
statusList.getAll().stream()
111111
.filter(status -> status.getMode().getType() == ChannelMode.Type.A_MASK)
112112
.forEach(status -> this.getTracker().trackChannelModeInfo(channel.getName(), status.getAction() == ModeStatus.Action.ADD,

0 commit comments

Comments
 (0)