Skip to content

Commit fff4f0f

Browse files
mangstadtmangstadt
committed
Update for changes to sochat4j
1 parent fabccba commit fff4f0f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+165
-165
lines changed

‎src/main/java/oakbot/bot/Bot.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ public List<Integer> getAdminUsers() {
376376
@Override
377377
public boolean isRoomOwner(int roomId, int userId) throws IOException {
378378
var userInfo = connection.getUserInfo(roomId, userId);
379-
return (userInfo == null) ? false : userInfo.isOwner();
379+
return (userInfo == null) ? false : userInfo.owner();
380380
}
381381

382382
@Override
@@ -688,41 +688,41 @@ public void complete() {
688688
}
689689

690690
private void handleMessage(ChatMessage message) {
691-
if (timeout && !isAdminUser(message.getUserId())) {
691+
if (timeout && !isAdminUser(message.userId())) {
692692
//bot is in timeout, ignore
693693
return;
694694
}
695695

696-
if (message.getContent() == null) {
696+
if (message.isDeleted()) {
697697
//user deleted their message, ignore
698698
return;
699699
}
700700

701-
if (!allowedUsers.isEmpty() && !allowedUsers.contains(message.getUserId())) {
701+
if (!allowedUsers.isEmpty() && !allowedUsers.contains(message.userId())) {
702702
//message was posted by a user who is not in the green list, ignore
703703
return;
704704
}
705705

706-
if (bannedUsers.contains(message.getUserId())) {
706+
if (bannedUsers.contains(message.userId())) {
707707
//message was posted by a banned user, ignore
708708
return;
709709
}
710710

711-
var room = connection.getRoom(message.getRoomId());
711+
var room = connection.getRoom(message.roomId());
712712
if (room == null) {
713713
//the bot is no longer in the room
714714
return;
715715
}
716716

717-
if (message.getUserId() == userId) {
717+
if (message.userId() == userId) {
718718
//message was posted by this bot
719719
handleBotMessage(message);
720720
return;
721721
}
722722

723723
message = convertFromBotlerRelayMessage(message);
724724

725-
timeOfLastMessageByRoom.put(message.getRoomId(), message.getTimestamp());
725+
timeOfLastMessageByRoom.put(message.roomId(), message.timestamp());
726726

727727
var actions = handleListeners(message);
728728
handleActions(message, actions);
@@ -731,7 +731,7 @@ private void handleMessage(ChatMessage message) {
731731
private void handleBotMessage(ChatMessage message) {
732732
PostedMessage postedMessage;
733733
synchronized (postedMessages) {
734-
postedMessage = postedMessages.remove(message.getMessageId());
734+
postedMessage = postedMessages.remove(message.id());
735735
}
736736

737737
/*
@@ -756,14 +756,14 @@ private void handleBotMessage(ChatMessage message) {
756756
* edit the message so that the onebox no longer displays, but
757757
* the URL is still preserved.
758758
*/
759-
var messageIsOnebox = message.getContent().isOnebox();
759+
var messageIsOnebox = message.content().isOnebox();
760760
if (postedMessage != null && hideOneboxesAfter != null && (messageIsOnebox || postedMessage.isCondensableOrEphemeral())) {
761761
var postedMessageAge = Duration.between(postedMessage.getTimePosted(), Instant.now());
762762
var hideIn = hideOneboxesAfter.minus(postedMessageAge);
763763

764764
logger.atInfo().log(() -> {
765765
var action = messageIsOnebox ? "Hiding onebox" : "Condensing message";
766-
return action + " in " + hideIn.toMillis() + "ms [room=" + message.getRoomId() + ", id=" + message.getMessageId() + "]: " + message.getContent();
766+
return action + " in " + hideIn.toMillis() + "ms [room=" + message.roomId() + ", id=" + message.id() + "]: " + message.content();
767767
});
768768

769769
scheduleChore(hideIn, new CondenseMessageChore(postedMessage));
@@ -787,7 +787,7 @@ private void handleActions(ChatMessage message, ChatActions actions) {
787787
return;
788788
}
789789

790-
logger.atInfo().log(() -> "Responding to message [room=" + message.getRoomId() + ", user=" + message.getUsername() + ", id=" + message.getMessageId() + "]: " + message.getContent());
790+
logger.atInfo().log(() -> "Responding to message [room=" + message.roomId() + ", user=" + message.username() + ", id=" + message.id() + "]: " + message.content());
791791

792792
if (stats != null) {
793793
stats.incMessagesRespondedTo();
@@ -829,26 +829,26 @@ private void handleActions(ChatMessage message, ChatActions actions) {
829829
private void handlePostMessageAction(PostMessage action, ChatMessage message) {
830830
try {
831831
if (action.delay() != null) {
832-
scheduleChore(action.delay(), new DelayedMessageChore(message.getRoomId(), action));
832+
scheduleChore(action.delay(), new DelayedMessageChore(message.roomId(), action));
833833
} else {
834834
if (action.broadcast()) {
835835
broadcastMessage(action);
836836
} else {
837-
sendMessage(message.getRoomId(), action);
837+
sendMessage(message.roomId(), action);
838838
}
839839
}
840840
} catch (Exception e) {
841-
logger.atError().setCause(e).log(() -> "Problem posting message [room=" + message.getRoomId() + "]: " + action.message());
841+
logger.atError().setCause(e).log(() -> "Problem posting message [room=" + message.roomId() + "]: " + action.message());
842842
}
843843
}
844844

845845
private ChatActions handleDeleteMessageAction(DeleteMessage action, ChatMessage message) {
846846
try {
847-
var room = connection.getRoom(message.getRoomId());
847+
var room = connection.getRoom(message.roomId());
848848
room.deleteMessage(action.messageId());
849849
return action.onSuccess().get();
850850
} catch (Exception e) {
851-
logger.atError().setCause(e).log(() -> "Problem deleting message [room=" + message.getRoomId() + ", messageId=" + action.messageId() + "]");
851+
logger.atError().setCause(e).log(() -> "Problem deleting message [room=" + message.roomId() + ", messageId=" + action.messageId() + "]");
852852
return action.onError().apply(e);
853853
}
854854
}
@@ -1081,11 +1081,11 @@ public void complete() {
10811081
* "https://chat.stackoverflow.com/transcript/message/57337679#57337679">example</a>
10821082
*/
10831083
private ChatMessage convertFromBotlerRelayMessage(ChatMessage message) {
1084-
if (message.getUserId() != BOTLER_ID) {
1084+
if (message.userId() != BOTLER_ID) {
10851085
return message;
10861086
}
10871087

1088-
var content = message.getContent();
1088+
var content = message.content();
10891089
if (content == null) {
10901090
return message;
10911091
}

‎src/main/java/oakbot/bot/ChatActions.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public static ChatActions reply(CharSequence message, long parentId) {
7171
* @return the created object
7272
*/
7373
public static ChatActions reply(CharSequence message, ChatMessage parent) {
74-
return reply(message, parent.getMessageId());
74+
return reply(message, parent.id());
7575
}
7676

7777
/**
@@ -97,7 +97,7 @@ public static ChatActions reply(CharSequence message, ChatCommand parent, SplitS
9797
//@formatter:off
9898
return ChatActions.create(
9999
new PostMessage(message)
100-
.parentId(parent.getMessage().getMessageId())
100+
.parentId(parent.getMessage().id())
101101
.splitStrategy(splitStrategy)
102102
);
103103
//@formatter:on

‎src/main/java/oakbot/bot/ChatCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public String getContentMarkdown() {
154154
* @return true if it's formatted in a monospace font, false if not
155155
*/
156156
public boolean isFixedWidthFont() {
157-
return message.getContent().isFixedWidthFont();
157+
return message.content().isFixedWidthFont();
158158
}
159159

160160
/**
@@ -166,7 +166,7 @@ public boolean isFixedWidthFont() {
166166
* command
167167
*/
168168
public static ChatCommand fromMessage(ChatMessage message, String trigger) {
169-
var contentObj = message.getContent();
169+
var contentObj = message.content();
170170
if (contentObj == null) {
171171
return null;
172172
}

‎src/main/java/oakbot/chat/mock/FileChatClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ public String getOriginalMessageContent(long messageId) throws IOException {
114114
private String _getMessageContent(long messageId) throws IOException {
115115
for (var room : rooms) {
116116
for (var message : room.getAllMessages()) {
117-
if (message.getMessageId() == messageId) {
118-
return message.getContent().getContent();
117+
if (message.id() == messageId) {
118+
return message.content().getContent();
119119
}
120120
}
121121
}

‎src/main/java/oakbot/chat/mock/FileChatRoom.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public FileChatRoom(int roomId, UserInfo human, Path inputFile, FileChatClient c
5454
try (var reader = new ChatRoomFileReader(inputFile)) {
5555
String line;
5656
while ((line = reader.readLine()) != null) {
57-
postMessage(human.getUserId(), human.getUsername(), line);
57+
postMessage(human.userId(), human.username(), line);
5858
}
5959
} catch (IOException e) {
6060
throw new UncheckedIOException(e);
@@ -181,7 +181,7 @@ public long postMessage(int userId, String username, String content) {
181181
.userId(userId)
182182
.username(username)
183183
.content(content)
184-
.messageId(id)
184+
.id(id)
185185
.timestamp(LocalDateTime.now())
186186
.build();
187187
//@formatter:on
@@ -198,7 +198,7 @@ public long postMessage(int userId, String username, String content) {
198198
//@formatter:off
199199
listener.accept(new MessagePostedEvent.Builder()
200200
.eventId(eventId.getAndIncrement())
201-
.timestamp(message.getTimestamp())
201+
.timestamp(message.timestamp())
202202
.message(message)
203203
.build());
204204
//@formatter:on
@@ -226,7 +226,7 @@ public List<UserInfo> getUserInfo(List<Integer> userIds) throws IOException {
226226
public List<PingableUser> getPingableUsers() throws IOException {
227227
//@formatter:off
228228
return List.of(
229-
new PingableUser(roomId, human.getUserId(), human.getUsername(), LocalDateTime.now()),
229+
new PingableUser(roomId, human.userId(), human.username(), LocalDateTime.now()),
230230
new PingableUser(roomId, botUserId, botUsername, LocalDateTime.now())
231231
);
232232
//@formatter:on
@@ -261,7 +261,7 @@ public String toString() {
261261
synchronized (messages) {
262262
sb.append(roomId).append(": ").append(messages.size()).append(" messages\n");
263263
for (var message : messages) {
264-
sb.append(" ").append(message.getContent()).append("\n");
264+
sb.append(" ").append(message.content()).append("\n");
265265
}
266266
}
267267

‎src/main/java/oakbot/command/AfkCommand.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ public HelpDoc help() {
5555

5656
@Override
5757
public ChatActions onMessage(ChatCommand chatCommand, IBot bot) {
58-
var username = chatCommand.getMessage().getUsername();
59-
var userId = chatCommand.getMessage().getUserId();
58+
var username = chatCommand.getMessage().username();
59+
var userId = chatCommand.getMessage().userId();
6060
var awayMessage = chatCommand.getContentMarkdown();
6161

6262
setAway(userId, username, awayMessage);
@@ -74,17 +74,17 @@ public ChatActions onMessage(ChatMessage message, IBot bot) {
7474
return doNothing();
7575
}
7676

77-
var returned = setBack(message.getUserId());
77+
var returned = setBack(message.userId());
7878

79-
var mentions = new HashSet<>(message.getContent().getMentions()); //remove duplicates
79+
var mentions = new HashSet<>(message.content().getMentions()); //remove duplicates
8080
var mentionedAfkUsers = getAfkUsers(mentions);
81-
var usersNotWarnedAbout = filterUsersNotWarnedAbout(mentionedAfkUsers, message.getUserId());
81+
var usersNotWarnedAbout = filterUsersNotWarnedAbout(mentionedAfkUsers, message.userId());
8282
if (!usersNotWarnedAbout.isEmpty()) {
8383
var cb = new ChatBuilder();
8484
var first = true;
8585
usersNotWarnedAbout.sort(Comparator.comparing(AfkUser::getUsername));
8686
for (var afkUser : usersNotWarnedAbout) {
87-
afkUser.setTimeLastWarnedUser(message.getUserId());
87+
afkUser.setTimeLastWarnedUser(message.userId());
8888

8989
if (!first) {
9090
cb.nl();

‎src/main/java/oakbot/command/Command.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ default Collection<String> aliases() {
5050
* @return true if the message is invoking this command, false if not
5151
*/
5252
default boolean isInvokingMe(ChatMessage message, String trigger) {
53-
var content = message.getContent().getContent();
53+
var content = message.content().getContent();
5454

5555
var names = new ArrayList<String>();
5656
names.add(name());

‎src/main/java/oakbot/command/DeleteCommand.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public ChatActions onMessage(ChatCommand chatCommand, IBot bot) {
6060
return reply("Message ID or permalink is required.", chatCommand);
6161
}
6262

63-
var messageToReplyToOnError = chatCommand.getMessage().getMessageId();
63+
var messageToReplyToOnError = chatCommand.getMessage().id();
6464

6565
return deleteAction(messageToDelete, messageToReplyToOnError);
6666
}
@@ -77,13 +77,13 @@ private long parseMessageId(String content) {
7777
@Override
7878
public ChatActions onMessage(ChatMessage message, IBot bot) {
7979
//is the message a reply?
80-
var messageToDelete = message.getParentMessageId();
80+
var messageToDelete = message.parentMessageId();
8181
if (messageToDelete == 0) {
8282
return doNothing();
8383
}
8484

8585
//is it replying to a bot message?
86-
var content = message.getContent().getContent();
86+
var content = message.content().getContent();
8787
var mention = "@" + bot.getUsername().replace(" ", "");
8888
if (!content.startsWith(mention)) {
8989
return doNothing();
@@ -103,7 +103,7 @@ public ChatActions onMessage(ChatMessage message, IBot bot) {
103103
catchAllListener.ignoreNextMessage();
104104
}
105105

106-
var messageToReplyToOnError = message.getMessageId();
106+
var messageToReplyToOnError = message.id();
107107
return deleteAction(messageToDelete, messageToReplyToOnError);
108108
}
109109

‎src/main/java/oakbot/command/FatCatCommand.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ private ChatActions addCat(ChatCommand chatCommand, IBot bot, String cat) {
149149
return reply("Cat already added.", chatCommand);
150150
}
151151

152-
var conversation = new Conversation(chatCommand.getMessage().getRoomId(), chatCommand.getMessage().getUserId(), cat);
152+
var conversation = new Conversation(chatCommand.getMessage().roomId(), chatCommand.getMessage().userId(), cat);
153153
conversations.add(conversation);
154154

155155
return reply("Is cat fat? (y/n)", chatCommand);
@@ -190,17 +190,17 @@ private ChatActions deleteCat(ChatCommand chatCommand, IBot bot, String cat) {
190190
}
191191

192192
private boolean hasEditPerms(ChatCommand chatCommand, IBot bot) {
193-
var authorId = chatCommand.getMessage().getUserId();
193+
var authorId = chatCommand.getMessage().userId();
194194
return bot.isAdminUser(authorId) || commandAdmins.contains(authorId);
195195
}
196196

197197
private String handleResponse(ChatMessage message) {
198-
var conversation = conversations.get(message.getRoomId(), message.getUserId());
198+
var conversation = conversations.get(message.roomId(), message.userId());
199199
if (conversation == null) {
200200
return null;
201201
}
202202

203-
var content = message.getContent().getContent();
203+
var content = message.content().getContent();
204204
if (content.isEmpty()) {
205205
return null;
206206
}

‎src/main/java/oakbot/command/FishCommand.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public ChatActions onMessage(ChatCommand chatCommand, IBot bot) {
129129
}
130130

131131
private ChatActions handleInvCommand(ChatCommand chatCommand) {
132-
var userId = chatCommand.getMessage().getUserId();
132+
var userId = chatCommand.getMessage().userId();
133133
var inv = inventoryByUser.get(userId);
134134

135135
String message;
@@ -165,8 +165,8 @@ private ChatActions handleInvCommand(ChatCommand chatCommand) {
165165
}
166166

167167
private ChatActions handleStatusCommand(ChatCommand chatCommand) {
168-
var roomId = chatCommand.getMessage().getRoomId();
169-
var userId = chatCommand.getMessage().getUserId();
168+
var roomId = chatCommand.getMessage().roomId();
169+
var userId = chatCommand.getMessage().userId();
170170
var pendingCatchesInThisRoom = getPendingCatchesInRoom(roomId);
171171
var pendingCatch = pendingCatchesInThisRoom.get(userId);
172172

@@ -187,8 +187,8 @@ private ChatActions handleStatusCommand(ChatCommand chatCommand) {
187187
}
188188

189189
private ChatActions handleReleaseCommand(String fishName, ChatCommand chatCommand) {
190-
var userId = chatCommand.getMessage().getUserId();
191-
var username = chatCommand.getMessage().getUsername();
190+
var userId = chatCommand.getMessage().userId();
191+
var username = chatCommand.getMessage().username();
192192
var inv = inventoryByUser.get(userId);
193193

194194
if (fishName == null) {
@@ -211,9 +211,9 @@ private ChatActions handleReleaseCommand(String fishName, ChatCommand chatComman
211211
}
212212

213213
private ChatActions throwOrPullLine(ChatCommand chatCommand, boolean again) {
214-
var roomId = chatCommand.getMessage().getRoomId();
215-
var userId = chatCommand.getMessage().getUserId();
216-
var username = chatCommand.getMessage().getUsername();
214+
var roomId = chatCommand.getMessage().roomId();
215+
var userId = chatCommand.getMessage().userId();
216+
var username = chatCommand.getMessage().username();
217217
var pendingCatchesInThisRoom = getPendingCatchesInRoom(roomId);
218218

219219
var pendingCatch = pendingCatchesInThisRoom.remove(userId);

0 commit comments

Comments
 (0)