Skip to content

Commit 35405ed

Browse files
committed
Escaped String should be transformed back as well
1 parent 3637e62 commit 35405ed

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

src/main/java/de/votesapp/client/GroupMessage.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ private static String escapeDot(final String txt) {
5555
// But then we need to have one. Now it's autoconfigured
5656
return StringUtils.replace(txt, ".", "_");
5757
}
58+
59+
public static String unescapeDot(String txt) {
60+
return StringUtils.replace(txt, "_", ".");
61+
}
5862

5963
/**
6064
* Unique messageId. 4917917413454-1, 2, 3, ...
@@ -90,4 +94,5 @@ public User sender() {
9094
public String normalizedText() {
9195
return TextNormalizer.normalize(text);
9296
}
97+
9398
}

src/main/java/de/votesapp/client/YowsupRestClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void sendGroupMessage(final GroupMessage messageToSend) {
3535
// WhatsApp won't return the unique messages IDs, so we don't receive a
3636
// resource ID for that.
3737
final Map<String, String> message = new HashMap<>();
38-
message.put("to", messageToSend.getGroupId().replaceAll("_", "."));
38+
message.put("to", GroupMessage.unescapeDot(messageToSend.getGroupId()));
3939
// TODO: Add test that the text is trimmed. WhatsApp doesn't accept
4040
// messages ending with \n!
4141
message.put("text", trim(messageToSend.getText()));
@@ -73,7 +73,7 @@ public GroupMessage[] fetchGroupMessages() throws WhatsAppConnectionException {
7373

7474
private void deleteMessages(final GroupMessage... messages) {
7575
for (final GroupMessage msg : messages) {
76-
restTemplate.delete(yowsupRestConfig.getBaseUrl() + "/messages/inbox/{id}", msg.getId());
76+
restTemplate.delete(yowsupRestConfig.getBaseUrl() + "/messages/inbox/{id}", GroupMessage.unescapeDot(msg.getId()));
7777
}
7878
}
7979
}

0 commit comments

Comments
 (0)