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.

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

Fix swallowed text between 2 mentions downstream #30

Merged
merged 1 commit into from
Dec 7, 2023
Merged
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/SlackMessageParser.ts
Original file line number Diff line number Diff line change
@@ -237,7 +237,7 @@ export class SlackMessageParser {

// TODO: This is fixing plaintext mentions, but should be refactored.
// https://github.com/matrix-org/matrix-appservice-slack/issues/110
body = body.replace(/<https:\/\/matrix\.to\/#\/@.+:.+\|(.+)>/g, "$1");
body = body.replace(/<https:\/\/matrix\.to\/#\/@[^:]+:[^|]+\|([^>]+)>/g, "$1");

// Convert plain text body to HTML.
// We first run it through Slackdown, which will convert some elements to HTML.

Unchanged files with check annotations Beta

export interface IHandlerArgs {
respond: ResponseCallback;
resolve: () => void;
reject: (error: any) => void;

Check warning on line 23 in src/AdminCommand.ts

GitHub Actions / call-lint / lint

Unexpected any. Specify a different type
}
type CommandCallback = (args: Arguments<IHandlerArgs>) => void|Promise<void>;
id: `INTEG-${this.inboundId}`,
matrix_id: this.matrixRoomId,
remote: {
id: this.slackChannelId!,

Check warning on line 246 in src/BridgedRoom.ts

GitHub Actions / call-lint / lint

Forbidden non-null assertion
name: this.slackChannelName!,

Check warning on line 247 in src/BridgedRoom.ts

GitHub Actions / call-lint / lint

Forbidden non-null assertion
slack_team_id: this.slackTeamId!,

Check warning on line 248 in src/BridgedRoom.ts

GitHub Actions / call-lint / lint

Forbidden non-null assertion
slack_type: this.slackType!,

Check warning on line 249 in src/BridgedRoom.ts

GitHub Actions / call-lint / lint

Forbidden non-null assertion
slack_private: this.isPrivate,
webhook_uri: this.slackWebhookUri!,

Check warning on line 251 in src/BridgedRoom.ts

GitHub Actions / call-lint / lint

Forbidden non-null assertion
puppet_owner: this.puppetOwner!,

Check warning on line 252 in src/BridgedRoom.ts

GitHub Actions / call-lint / lint

Forbidden non-null assertion
},
remote_id: this.inboundId,
};
}
public async getClientForRequest(userId: string): Promise<{id: string, client: WebClient}|null> {
const puppet = await this.main.clientFactory.getClientForUserWithId(this.SlackTeamId!, userId);

Check warning on line 261 in src/BridgedRoom.ts

GitHub Actions / call-lint / lint

Forbidden non-null assertion
if (puppet) {
return puppet;
}
return null;
}
public async onMatrixReaction(message: any): Promise<void> {

Check warning on line 274 in src/BridgedRoom.ts

GitHub Actions / call-lint / lint

Unexpected any. Specify a different type
const relatesTo = message.content["m.relates_to"];
const eventStore = this.main.datastore;
const event = await eventStore.getEventByMatrixId(message.room_id, relatesTo.event_id);
await this.main.datastore.upsertReaction({
roomId: message.room_id,
eventId: message.event_id,
slackChannelId: this.slackChannelId!,

Check warning on line 326 in src/BridgedRoom.ts

GitHub Actions / call-lint / lint

Forbidden non-null assertion
slackMessageTs: event.slackTs,
// TODO We post reactions as the bot, not the user. Search for #fix_reactions_as_bot.
slackUserId: this.team!.user_id,