Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Slash command to manually discard outbound session #6668

Merged
merged 2 commits into from
Sep 5, 2022
Merged

Slash command to manually discard outbound session #6668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb63e89
Slash command to discard session
Anderas Aug 31, 2022
9b0b579
Changelog
Anderas Sep 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Riot/Modules/MatrixKit/Models/Room/MXKSlashCommands.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ FOUNDATION_EXPORT NSString *const kMXKSlashCmdUnbanUser;
FOUNDATION_EXPORT NSString *const kMXKSlashCmdSetUserPowerLevel;
FOUNDATION_EXPORT NSString *const kMXKSlashCmdResetUserPowerLevel;
FOUNDATION_EXPORT NSString *const kMXKSlashCmdChangeRoomTopic;
FOUNDATION_EXPORT NSString *const kMXKSlashCmdDiscardSession;
1 change: 1 addition & 0 deletions Riot/Modules/MatrixKit/Models/Room/MXKSlashCommands.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@
NSString *const kMXKSlashCmdSetUserPowerLevel = @"/op";
NSString *const kMXKSlashCmdResetUserPowerLevel = @"/deop";
NSString *const kMXKSlashCmdChangeRoomTopic = @"/topic";
NSString *const kMXKSlashCmdDiscardSession = @"/discardsession";
6 changes: 6 additions & 0 deletions Riot/Modules/Room/MXKRoomViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1438,6 +1438,12 @@ - (BOOL)sendAsIRCStyleCommandIfPossible:(NSString*)string
cmdUsage = @"Usage: /topic <topic>";
}
}
else if ([string hasPrefix:kMXKSlashCmdDiscardSession])
{
[roomDataSource.mxSession.crypto discardOutboundGroupSessionForRoomWithRoomId:roomDataSource.roomId onComplete:^{
MXLogDebug(@"[MXKRoomVC] Manually discarded outbound group session");
}];
}
else
{
// Retrieve userId
Expand Down
1 change: 1 addition & 0 deletions changelog.d/pr-6668.change
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Crypto: Slash command to discard outbound session