MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass AccountAndAuthenticatedDeviceHolder to spam filter

This commit is contained in:
Ameya Lokare 2024-06-24 16:42:34 -07:00
parent f52c40a492
commit ec009a2bba
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
View File

@ -327,7 +327,7 @@ public class MessageController {
final Optional<byte[]> spamReportToken = switch (senderType) { final Optional<byte[]> spamReportToken = switch (senderType) {
case SENDER_TYPE_IDENTIFIED -> case SENDER_TYPE_IDENTIFIED ->
reportSpamTokenProvider.makeReportSpamToken(context, source.get().getAccount(), destination); reportSpamTokenProvider.makeReportSpamToken(context, source.get(), destination);
default -> Optional.empty(); default -> Optional.empty();
}; };

4
service/src/main/java/org/whispersystems/textsecuregcm/spam/ReportSpamTokenProvider.java
View File

@ -1,9 +1,9 @@
package org.whispersystems.textsecuregcm.spam; package org.whispersystems.textsecuregcm.spam;
import org.whispersystems.textsecuregcm.auth.AccountAndAuthenticatedDeviceHolder;
import org.whispersystems.textsecuregcm.storage.Account; import org.whispersystems.textsecuregcm.storage.Account;
import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerRequestContext;
import java.util.Optional; import java.util.Optional;
import java.util.function.Function;
/** /**
* Generates ReportSpamTokens to be used for spam reports. * Generates ReportSpamTokens to be used for spam reports.
@ -18,7 +18,7 @@ public interface ReportSpamTokenProvider {
* @param maybeDestination the intended recepient of the message if available * @param maybeDestination the intended recepient of the message if available
* @return either a generated token or nothing * @return either a generated token or nothing
*/ */
Optional<byte[]> makeReportSpamToken(ContainerRequestContext context, final Account sender, Optional<byte[]> makeReportSpamToken(ContainerRequestContext context, final AccountAndAuthenticatedDeviceHolder sender,
final Optional<Account> maybeDestination); final Optional<Account> maybeDestination);
/** /**