Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit be91ce4

Browse files
committedMar 17, 2025·
fix(bots): Allow edit in 1-1
Signed-off-by: Marcel Müller <marcel-mueller@gmx.de>
1 parent 4c3146b commit be91ce4

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed
 

‎NextcloudTalk/NCChatMessage.swift

+3-2
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,14 @@ import SwiftyAttributes
7979

8080
let sameUser = self.isMessage(from: account.userId)
8181
let moderatorUser = (room.type != .oneToOne && room.type != .formerOneToOne) && (room.participantType == .owner || room.participantType == .moderator)
82+
let botInOneToOne = room.type == .oneToOne && self.actorType == NCAttendeeTypeBots && self.actorId.starts(with: NCAttendeeBotPrefix)
8283

83-
let userCanDeleteMessage = sameUser || moderatorUser
84+
let userCanEditMessage = sameUser || moderatorUser || botInOneToOne
8485

8586
let noTimeLimitForMessageEdit = (room.type == .noteToSelf) && NCDatabaseManager.sharedInstance().serverHasTalkCapability(kCapabilityEditMessagesNoteToSelf, forAccountId: account.accountId)
8687
let editAllowedByTime = noTimeLimitForMessageEdit || (self.timestamp >= twentyFourHoursAgoTimestamp)
8788

88-
return serverCanEditMessage && userCanDeleteMessage && editAllowedByTime
89+
return serverCanEditMessage && userCanEditMessage && editAllowedByTime
8990
}
9091

9192
public var isObjectShare: Bool {

‎NextcloudTalk/NCRoomParticipant.h

+3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ extern NSString * const NCAttendeeTypeTeams;
2121
extern NSString * const NCAttendeeTypeGuest;
2222
extern NSString * const NCAttendeeTypeEmail;
2323
extern NSString * const NCAttendeeTypeFederated;
24+
extern NSString * const NCAttendeeTypeBots;
25+
26+
extern NSString * const NCAttendeeBotPrefix;
2427

2528
extern NSString * const NCAttendeeBridgeBotId;
2629

‎NextcloudTalk/NCRoomParticipants.m

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
NSString * const NCAttendeeTypeGuest = @"guests";
1616
NSString * const NCAttendeeTypeEmail = @"emails";
1717
NSString * const NCAttendeeTypeFederated = @"federated_users";
18+
NSString * const NCAttendeeTypeBots = @"bots";
19+
20+
NSString * const NCAttendeeBotPrefix = @"bot-";
1821

1922
NSString * const NCAttendeeBridgeBotId = @"bridge-bot";
2023

0 commit comments

Comments
 (0)
Please sign in to comment.