Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-20 03:08:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't return message IDs from the "insert message" script

Browse Source
This commit is contained in:
Jon Chambers
2024-11-07 14:50:01 -05:00
committed by Jon Chambers
parent 7158a504fa
commit 1fa31b3974
4 changed files with 57 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java
View File

@@ -211,10 +211,13 @@ public class MessagesCache {
this.removeRecipientViewFromMrmDataScript = removeRecipientViewFromMrmDataScript;
}
public long insert(final UUID guid, final UUID destinationUuid, final byte destinationDevice,
public void insert(final UUID messageGuid,
final UUID destinationAccountIdentifier,
final byte destinationDeviceId,
final MessageProtos.Envelope message) {
final MessageProtos.Envelope messageWithGuid = message.toBuilder().setServerGuid(guid.toString()).build();
return insertTimer.record(() -> insertScript.execute(destinationUuid, destinationDevice, messageWithGuid));
final MessageProtos.Envelope messageWithGuid = message.toBuilder().setServerGuid(messageGuid.toString()).build();
insertTimer.record(() -> insertScript.execute(destinationAccountIdentifier, destinationDeviceId, messageWithGuid));
}
public byte[] insertSharedMultiRecipientMessagePayload(

4
service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCacheInsertScript.java
View File

@@ -27,7 +27,7 @@ class MessagesCacheInsertScript {
this.insertScript = ClusterLuaScript.fromResource(redisCluster, "lua/insert_item.lua", ScriptOutputType.INTEGER);
}
long execute(final UUID destinationUuid, final byte destinationDevice, final MessageProtos.Envelope envelope) {
void execute(final UUID destinationUuid, final byte destinationDevice, final MessageProtos.Envelope envelope) {
assert envelope.hasServerGuid();
assert envelope.hasServerTimestamp();
@@ -43,6 +43,6 @@ class MessagesCacheInsertScript {
envelope.getServerGuid().getBytes(StandardCharsets.UTF_8) // guid
));
return (long) insertScript.executeBinary(keys, args);
insertScript.executeBinary(keys, args);
}
}