Skip to content

Commit 4b12ca4

Browse files
committed
Fix message deletion
1 parent ab1cd7b commit 4b12ca4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/main/java/smithereen/controllers/MailController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,8 @@ public void deleteMessage(User self, MailMessage message){
253253

254254
public void actuallyDeleteMessage(User self, MailMessage message, boolean deleteRelated){
255255
try{
256-
if(message.ownerID!=self.id && message.senderID!=self.id){
257-
throw new IllegalArgumentException("This user can't delete this message");
256+
if(message.ownerID!=self.id || message.senderID!=self.id){
257+
throw new UserActionNotAllowedException("This user can't delete this message");
258258
}
259259
Set<Long> idsToDelete=new HashSet<>();
260260
idsToDelete.add(message.id);

src/main/java/smithereen/routes/MailRoutes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public static Object delete(Request req, Response resp, Account self, Applicatio
253253
}else{
254254
origElementID="msgRow"+msg.getIdString();
255255
}
256-
if(msg.isUnread()){
256+
if(msg.isUnread() && msg.senderID==self.user.id){
257257
restoreHtml+=TextProcessor.substituteLinks(l.get(msg.to.size()>1 ? "restore_or_delete_for_peer_multi" : "restore_or_delete_for_peer",
258258
Map.of("name", ctx.getUsersController().getUserOrThrow(msg.getFirstRecipientID()).getFirstAndGender())),
259259
Map.of(

0 commit comments

Comments
 (0)