Element devs changed all the paths...again

This commit is contained in:
q
2026-04-24 23:16:08 -04:00
parent e146ba35c0
commit b5137ea70b
8 changed files with 25 additions and 25 deletions

View File

@@ -35,7 +35,7 @@ cd patches/
``` ```
4. Build Element Web 4. Build Element Web
``` ```
cd ../element-web cd ../element-web/apps/web
pnpm dist pnpm dist
``` ```

View File

@@ -31,10 +31,10 @@ echo 'Adding custom emoji...'
echo 'Backing up _EmojiPicker.pcss...' echo 'Backing up _EmojiPicker.pcss...'
if [ ! -f "${1}"/res/css/views/emojipicker/_EmojiPicker.pcss.backup ]; then if [ ! -f "${1}"/apps/web/res/css/views/emojipicker/_EmojiPicker.pcss.backup ]; then
cp "${1}"/res/css/views/emojipicker/_EmojiPicker.pcss "${1}"/res/css/views/emojipicker/_EmojiPicker.pcss.backup cp "${1}"/apps/web/res/css/views/emojipicker/_EmojiPicker.pcss "${1}"/apps/web/res/css/views/emojipicker/_EmojiPicker.pcss.backup
else else
cp "${1}"/res/css/views/emojipicker/_EmojiPicker.pcss.backup "${1}"/res/css/views/emojipicker/_EmojiPicker.pcss cp "${1}"/apps/web/res/css/views/emojipicker/_EmojiPicker.pcss.backup "${1}"/apps/web/res/css/views/emojipicker/_EmojiPicker.pcss
fi fi
echo 'Adding custom emoji picker CSS...' echo 'Adding custom emoji picker CSS...'
@@ -47,4 +47,4 @@ emoji_picker_css_code=$(cat << EOF
EOF EOF
) )
echo "${emoji_picker_css_code}" >> "${1}"/res/css/views/emojipicker/_EmojiPicker.pcss echo "${emoji_picker_css_code}" >> "${1}"/apps/web/res/css/views/emojipicker/_EmojiPicker.pcss

View File

@@ -23,8 +23,8 @@ error() {
} }
patch_content=$(cat << EOF patch_content=$(cat << EOF
--- a/src/components/views/auth/AuthPage.tsx --- a/apps/web/src/components/views/auth/AuthPage.tsx
+++ b/src/components/views/auth/AuthPage.tsx +++ b/apps/web/src/components/views/auth/AuthPage.tsx
@@ -70,7 +70,6 @@ export default class AuthPage extends React.PureComponent<React.PropsWithChildre @@ -70,7 +70,6 @@ export default class AuthPage extends React.PureComponent<React.PropsWithChildre
{this.props.children} {this.props.children}
</div> </div>

View File

@@ -1,5 +1,5 @@
--- a/src/slash-commands/SlashCommands.tsx --- a/apps/web/src/slash-commands/SlashCommands.tsx
+++ b/src/slash-commands/SlashCommands.tsx +++ b/apps/web/src/slash-commands/SlashCommands.tsx
@@ -68,6 +68,29 @@ @@ -68,6 +68,29 @@
export const Commands = [ export const Commands = [

View File

@@ -1,5 +1,5 @@
--- a/src/components/views/dialogs/ShareDialog.tsx 2026-02-15 16:02:44.000000000 -0500 --- a/apps/web/src/components/views/dialogs/ShareDialog.tsx 2026-02-15 16:02:44.000000000 -0500
+++ b/src/components/views/dialogs/ShareDialog.tsx 2026-02-15 16:11:14.557058244 -0500 +++ b/apps/web/src/components/views/dialogs/ShareDialog.tsx 2026-02-15 16:11:14.557058244 -0500
@@ -25,26 +25,6 @@ @@ -25,26 +25,6 @@
/* eslint-disable @typescript-eslint/no-require-imports */ /* eslint-disable @typescript-eslint/no-require-imports */
const SOCIALS = [ const SOCIALS = [

View File

@@ -20,4 +20,4 @@
echo "Replacing login background..." echo "Replacing login background..."
cp -f "./files/lake.jpg" "${1}"/res/themes/element/img/backgrounds/lake.jpg cp -f "./files/lake.jpg" "${1}"/apps/web/res/themes/element/img/backgrounds/lake.jpg

View File

@@ -24,7 +24,7 @@
echo "Replacing notification sounds..." echo "Replacing notification sounds..."
#cp -f "./files/message.mp3" "${1}"/webapp/media/message.mp3 #cp -f "./files/message.mp3" "${1}"/webapp/media/message.mp3
cp -f "./files/message.mp3" "${1}"/res/media/message.mp3 cp -f "./files/message.mp3" "${1}"/apps/web/res/media/message.mp3
#cp -f "./files/message.ogg" "${1}"/webapp/media/message.ogg #cp -f "./files/message.ogg" "${1}"/webapp/media/message.ogg
cp -f "./files/message.ogg" "${1}"/res/media/message.ogg cp -f "./files/message.ogg" "${1}"/apps/web/res/media/message.ogg

View File

@@ -45,10 +45,10 @@ error() {
# Remove # Remove
sed -i -e "s/remove/${remove_command}/g" \ sed -i -e "s/remove/${remove_command}/g" \
-e "s/Removes/${capital_remove_command_plural}/g" "${1}"/src/slash-commands/SlashCommands.tsx -e "s/Removes/${capital_remove_command_plural}/g" "${1}"/apps/web/src/slash-commands/SlashCommands.tsx
sed -i -e "s/\"Remove/\"${capital_remove_command}/g" \ sed -i -e "s/\"Remove/\"${capital_remove_command}/g" \
-e "s/Failed to remove/Failed to ${remove_command}/g" "${1}"/src/components/views/right_panel/UserInfo.tsx -e "s/Failed to remove/Failed to ${remove_command}/g" "${1}"/apps/web/src/components/views/right_panel/UserInfo.tsx
sed -i -e "s/Removes user/${capital_remove_command_plural} user/g" \ sed -i -e "s/Removes user/${capital_remove_command_plural} user/g" \
-e "s/)s removed %(tar/)s ${remove_command_past_tense} %(tar/g" \ -e "s/)s removed %(tar/)s ${remove_command_past_tense} %(tar/g" \
@@ -58,16 +58,16 @@ sed -i -e "s/Removes user/${capital_remove_command_plural} user/g" \
-e "s/Remove from space/${capital_remove_command}/g" \ -e "s/Remove from space/${capital_remove_command}/g" \
-e "s/Remove from %(roomName)s/${capital_remove_command} from %(roomName)s/g" \ -e "s/Remove from %(roomName)s/${capital_remove_command} from %(roomName)s/g" \
-e "s/\"Remove them/\"${capital_remove_command} ${them}/g" \ -e "s/\"Remove them/\"${capital_remove_command} ${them}/g" \
-e "s/removed\"/${remove_command_past_tense}\"/g" "${1}"/src/i18n/strings/en_EN.json -e "s/removed\"/${remove_command_past_tense}\"/g" "${1}"/apps/web/src/i18n/strings/en_EN.json
sed -i -e "s/senderName)s removed %(targetName/senderName)s ${remove_command_past_tense} %(targetName/g" "${1}"/src/TextForEvent.tsx sed -i -e "s/senderName)s removed %(targetName/senderName)s ${remove_command_past_tense} %(targetName/g" "${1}"/apps/web/src/TextForEvent.tsx
sed -i -e "s/removed/${remove_command_past_tense}/g" "${1}"/src/components/views/rooms/RoomPreviewBar.tsx sed -i -e "s/removed/${remove_command_past_tense}/g" "${1}"/apps/web/src/components/views/rooms/RoomPreviewBar.tsx
sed -i -e "s/Remove users/${capital_remove_command} users/g" "${1}"/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx sed -i -e "s/Remove users/${capital_remove_command} users/g" "${1}"/apps/web/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
sed -i -e "s/${capital_remove_command} recent/Remove recent/g" "${1}"/src/i18n/strings/en_EN.json sed -i -e "s/${capital_remove_command} recent/Remove recent/g" "${1}"/apps/web/src/i18n/strings/en_EN.json
sed -i -e "s/${capital_remove_command} recent/Remove recent/g" "${1}"/src/components/views/right_panel/UserInfo.tsx sed -i -e "s/${capital_remove_command} recent/Remove recent/g" "${1}"/apps/web/src/components/views/right_panel/UserInfo.tsx
# Ban # Ban
sed -i -e "s/\"Ban\"/\"${capital_ban_command}\"/g" "${1}"/src/components/views/right_panel/UserInfo.tsx || error sed -i -e "s/\"Ban\"/\"${capital_ban_command}\"/g" "${1}"/apps/web/src/components/views/right_panel/UserInfo.tsx || error
sed -i -e "s/Bans user with given id\",/${capital_ban_command_plural} user with given id\",/g" \ sed -i -e "s/Bans user with given id\",/${capital_ban_command_plural} user with given id\",/g" \
-e "s/\"Ban from %(roomName)s\",/\"${capital_ban_command} from %(roomName)s\",/g" \ -e "s/\"Ban from %(roomName)s\",/\"${capital_ban_command} from %(roomName)s\",/g" \
@@ -83,7 +83,7 @@ sed -i -e "s/Bans user with given id\",/${capital_ban_command_plural} user with
-e "s/banned from %(roomName)s by %(memberName)s\",/${ban_command_past_tense} from %(roomName)s by %(memberName)s\",/g" \ -e "s/banned from %(roomName)s by %(memberName)s\",/${ban_command_past_tense} from %(roomName)s by %(memberName)s\",/g" \
-e "s/were banned %(count)s times\",/were ${ban_command_past_tense} %(count)s times\",/g" \ -e "s/were banned %(count)s times\",/were ${ban_command_past_tense} %(count)s times\",/g" \
-e "s/s banned %(targetName)s: %(reason)s\",/s ${ban_command_past_tense} %(targetName)s: %(reason)s\",/g" \ -e "s/s banned %(targetName)s: %(reason)s\",/s ${ban_command_past_tense} %(targetName)s: %(reason)s\",/g" \
-e "s/s banned %(targetName)s\",/s ${ban_command_past_tense} %(targetName)s\",/g" "${1}"/src/i18n/strings/en_EN.json || error -e "s/s banned %(targetName)s\",/s ${ban_command_past_tense} %(targetName)s\",/g" "${1}"/apps/web/src/i18n/strings/en_EN.json || error
echo "Replacing gender neutral pronouns..." echo "Replacing gender neutral pronouns..."
# Gender neutral pronouns # Gender neutral pronouns
@@ -98,4 +98,4 @@ sed -i -e "s/oneUser)schanged their profile picture/oneUser)schanged ${their} pr
-e "s/before they can be invited/before ${they} can be invited/g" \ -e "s/before they can be invited/before ${they} can be invited/g" \
-e "s/until they are unbanned/until ${they} is unbanned/g" \ -e "s/until they are unbanned/until ${they} is unbanned/g" \
-e "s/them out and prevent them from logging back in. Additionally, they will leave all the rooms they are/${them} out and prevent ${them} from logging back in. Additionally, ${they} will leave all the rooms ${they} is/g" \ -e "s/them out and prevent them from logging back in. Additionally, they will leave all the rooms they are/${them} out and prevent ${them} from logging back in. Additionally, ${they} will leave all the rooms ${they} is/g" \
-e "s/oneUser)shad their invitation/oneUser)shad ${their} invitation/g" "${1}"/src/i18n/strings/en_EN.json || error -e "s/oneUser)shad their invitation/oneUser)shad ${their} invitation/g" "${1}"/apps/web/src/i18n/strings/en_EN.json || error