diff --git a/.changeset/pr207-myroomnick-unset.md b/.changeset/pr207-myroomnick-unset.md index 66b67053f..76252010f 100644 --- a/.changeset/pr207-myroomnick-unset.md +++ b/.changeset/pr207-myroomnick-unset.md @@ -2,4 +2,4 @@ sable: patch --- -Executing /myroomnick without a new nickname now removes the nickname. +Executing /myroomnick or /myroomavatar without a new nickname/avatar now removes the nickname/avatar. diff --git a/src/app/hooks/useCommands.ts b/src/app/hooks/useCommands.ts index eae38cbb6..fb1718747 100644 --- a/src/app/hooks/useCommands.ts +++ b/src/app/hooks/useCommands.ts @@ -464,23 +464,29 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => { name: Command.MyRoomAvatar, description: 'Change profile picture in current room. Example /myroomavatar mxc://xyzabc', exe: async (payload) => { - if (payload.match(/^mxc:\/\/\S+$/)) { - const mEvent = room - .getLiveTimeline() - .getState(EventTimeline.FORWARDS) - ?.getStateEvents(StateEvent.RoomMember, mx.getSafeUserId()); - const content = mEvent?.getContent(); - if (!content) return; - await mx.sendStateEvent( - room.roomId, - StateEvent.RoomMember as any, - { - ...content, - avatar_url: payload, - }, - mx.getSafeUserId() - ); + let newAvatar: string | undefined = payload.trim(); + if (newAvatar.length === 0) { + // no avatar, reset to global + newAvatar = profile.avatarUrl; + } else if (!newAvatar.match(/^mxc:\/\/\S+$/)) { + // bad mxc + return; } + const mEvent = room + .getLiveTimeline() + .getState(EventTimeline.FORWARDS) + ?.getStateEvents(StateEvent.RoomMember, mx.getSafeUserId()); + const content = mEvent?.getContent(); + if (!content) return; + await mx.sendStateEvent( + room.roomId, + StateEvent.RoomMember as any, + { + ...content, + avatar_url: newAvatar, + }, + mx.getSafeUserId() + ); }, }, [Command.ConvertToDm]: {