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

User correct Matrix accounts when redacting events #780

Merged
merged 5 commits into from
Apr 29, 2024
Merged

User correct Matrix accounts when redacting events #780

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d3a719d
Use correct Slack ghosts to redact messages sent from Slack
tadzik Mar 29, 2024
2443e46
Use our Matrix bot to redact Matrix messages deleted on Slack
tadzik Mar 29, 2024
dd11c2a
Don't delete all bot message with our main account
tadzik Apr 4, 2024
b4f2911
Refactor message deletion; fallback to using our bot if we can't dete…
tadzik Apr 5, 2024
e2df892
Changelog
tadzik Apr 17, 2024
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 src/BaseSlackHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export interface ISlackEventMessageAttachment {
}

export interface ISlackMessageEvent extends ISlackEvent {
team?: string;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have not actually seen team_id in incoming Slack messages, and the only place I see it used is when it's artificially assigned to in SlackRTMHandler – perhaps it's an error in our typing?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't really remember when this was introduced, it's possible it's invalid and team_id is the right one.

team_domain?: string;
team_id?: string;
user?: string;
Expand Down
25 changes: 23 additions & 2 deletions src/SlackEventHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,29 @@ export class SlackEventHandler extends BaseSlackHandler {
} else if (msg.subtype === "message_deleted" && msg.deleted_ts) {
const originalEvent = await this.main.datastore.getEventBySlackId(msg.channel, msg.deleted_ts);
if (originalEvent) {
const botClient = this.main.botIntent.matrixClient;
await botClient.redactEvent(originalEvent.roomId, originalEvent.eventId);
const previousMessage = msg.previous_message;
if (!previousMessage) {
log.error("Cannot delete message with no previous_message:", msg);
return;
}
if (previousMessage.subtype === 'bot_message') {
// Sent from Matrix, try to remove it with our bot account
try {
const botClient = this.main.botIntent.matrixClient;
await botClient.redactEvent(originalEvent.roomId, originalEvent.eventId, "Deleted on Slack");
} catch (err) {
log.error("Failed to remove message", previousMessage, "with our Matrix bot: insufficient power level? Error:", err);
return;
}
}
else if (!previousMessage.user) {
log.error("Cannot redact Slack message if we don't know the original sender:", previousMessage);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we just use the botClient?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in b4f2911; this has a side effect of us trying to delete messages sent by originally-Matrix users with the slack bot – which probably makes sense.

return;
}
else {
const ghost = await this.main.ghostStore.get(previousMessage.user, previousMessage.team_domain, previousMessage.team);
await ghost.redactEvent(originalEvent.roomId, originalEvent.eventId);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we try with the botClient if this fails, as a fallback?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in b4f2911

}
return;
}
// If we don't have the event
Expand Down
7 changes: 7 additions & 0 deletions src/SlackGhost.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,13 @@ export class SlackGhost {
return Slackdown.parse(body);
}

public async redactEvent(roomId: string, eventId: string) {
if (!this._intent) {
throw Error('No intent associated with ghost');
}
await this._intent.matrixClient.redactEvent(roomId, eventId);
}

public async sendInThread(roomId: string, text: string, slackRoomId: string,
slackEventTs: string, replyEvent: IMatrixReplyEvent): Promise<void> {
const content = {
Expand Down