-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Strip mentions from forwarded messages #30884
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
Open
twassman
wants to merge
6
commits into
element-hq:develop
Choose a base branch
from
twassman:strip-mentions-from-forwards
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+9
−4
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
0ac8981
strip mentions from forwarded messages
twassman 5fc1d5e
Merge branch 'element-hq:develop' into strip-mentions-from-forwards
twassman e682a67
Merge branch 'element-hq:develop' into strip-mentions-from-forwards
twassman ecd770a
call attachMentions() for empty m.mentions in forwarded messages
twassman cbe117e
fix lint and typecheck
twassman 232b447
update test "should be navigable using arrow keys"
twassman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -57,6 +57,7 @@ import { | |
import { getKeyBindingsManager } from "../../../KeyBindingsManager"; | ||
import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts"; | ||
import { OverflowTileView } from "../rooms/OverflowTileView"; | ||
import { attachMentions } from "../rooms/SendMessageComposer"; | ||
|
||
const AVATAR_SIZE = 30; | ||
|
||
|
@@ -178,7 +179,7 @@ const Entry: React.FC<IEntryProps<any>> = ({ room, type, content, matrixClient: | |
); | ||
}; | ||
|
||
const transformEvent = (event: MatrixEvent): { type: string; content: IContent } => { | ||
const transformEvent = (event: MatrixEvent, userId: string): { type: string; content: IContent } => { | ||
const { | ||
// eslint-disable-next-line @typescript-eslint/no-unused-vars | ||
"m.relates_to": _, // strip relations - in future we will attach a relation pointing at the original event | ||
|
@@ -213,6 +214,9 @@ const transformEvent = (event: MatrixEvent): { type: string; content: IContent } | |
}; | ||
} | ||
|
||
// Force an empty m.mentions property as there is no EditorModel to parse pills from | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Since we are explicitly forwarding an event here, I'd make this comment closer to what you have in the PR description, ie. talking about the fact we're stripping mentions from a forwarded message and why. |
||
attachMentions(userId, content, null, undefined); | ||
|
||
return { type, content }; | ||
}; | ||
|
||
|
@@ -223,7 +227,7 @@ const ForwardDialog: React.FC<IProps> = ({ matrixClient: cli, event, permalinkCr | |
cli.getProfileInfo(userId).then((info) => setProfileInfo(info)); | ||
}, [cli, userId]); | ||
|
||
const { type, content } = transformEvent(event); | ||
const { type, content } = transformEvent(event, userId); | ||
|
||
// For the message preview we fake the sender as ourselves | ||
const mockEvent = new MatrixEvent({ | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This function was just about squeaking by without doc as an internal function, although it still wasn't super clear in what way it's transforming it. Now it has another param, I think it really does need doc as I have absolutely no guesses as to what this function might do with the user ID it's been given.