diff --git a/package.json b/package.json index 9e39d5b..3101fcf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "keanuapp-weblite", - "version": "0.1.8", + "version": "0.1.9", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/package.json.bak b/package.json.bak index 4aa8d5e..9e39d5b 100644 --- a/package.json.bak +++ b/package.json.bak @@ -1,6 +1,6 @@ { "name": "keanuapp-weblite", - "version": "0.1.7", + "version": "0.1.8", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/src/assets/translations/en.json b/src/assets/translations/en.json index 660c89b..0bbcda2 100644 --- a/src/assets/translations/en.json +++ b/src/assets/translations/en.json @@ -11,7 +11,8 @@ "send": "Send", "back": "BACK", "login": "Login", - "logout": "Logout" + "logout": "Logout", + "new_room": "New Room" }, "message": { "you": "You", @@ -47,25 +48,36 @@ "user_is_typing": "{user} is typing", "users_are_typing": "{count} members are typing", "room_powerlevel_change": "{user} changed powerlevel of {changes}", - "user_powerlevel_change_from_to": "{user} from {powerOld} to {powerNew}" + "user_powerlevel_change_from_to": "{user} from {powerOld} to {powerNew}", + "user_changed_guest_access_closed": "{user} disallowed guests to join the room", + "user_changed_guest_access_open": "{user} allowed guests to join the room" }, "room": { "members": "no members | 1 member | {count} members", - "leave": "Leave" + "leave": "Leave", + "purge_set_room_state": "Setting room state", + "purge_redacting_events": "Redacting events", + "purge_removing_members": "Removing members", + "purge_failed": "Failed to purge room!", + "room_list_invites": "Invites", + "room_list_rooms": "Rooms" }, "room_welcome": { "welcome": "Welcome!", "info": "Here are a few things to know about your group:", - "join_public": "Anyone can join by opening this link: {link}", + "encrypted": "Messages are end-to-end encrypted.", + "room_history_is": "Room history is {type}.", + "join_public": "Anyone can join by opening this link: {link}.", "join_invite": "Only people you invite can join.", "info_permissions": "You can change 'join permissions' and 'message history' at any time in the group settings.", "got_it": "Got it" }, "new_room": { - "new_room": "New Group", - "done": "Done", + "new_room": "New Room", + "create": "Create", "next": "Next", "name_room": "Name group", + "room_topic": "Add a description if you like", "join_permissions": "Join permissions", "set_join_permissions": "Set Join Permissions", "join_permissions_info": "These permissions determine how people can join the group and how easily others can be invited. They can be changed anytime.", @@ -161,8 +173,7 @@ }, "room_info_sheet": { "this_room": "This group", - "view_details": "View details", - "create_room": "Create group" + "view_details": "View details" }, "voice_recorder": { "swipe_to_cancel": "Swipe to cancel", diff --git a/src/components/Chat.vue b/src/components/Chat.vue index 2a792e5..8428a88 100644 --- a/src/components/Chat.vue +++ b/src/components/Chat.vue @@ -451,6 +451,7 @@ import RoomAvatarChanged from "./messages/RoomAvatarChanged.vue"; import RoomHistoryVisibility from "./messages/RoomHistoryVisibility.vue"; import RoomJoinRules from "./messages/RoomJoinRules.vue"; import RoomPowerLevelsChanged from "./messages/RoomPowerLevelsChanged.vue"; +import RoomGuestAccessChanged from "./messages/RoomGuestAccessChanged.vue"; import RoomEncrypted from "./messages/RoomEncrypted.vue"; import DebugEvent from "./messages/DebugEvent.vue"; import util from "../plugins/utils"; @@ -530,6 +531,7 @@ export default { RoomHistoryVisibility, RoomJoinRules, RoomPowerLevelsChanged, + RoomGuestAccessChanged, RoomEncrypted, DebugEvent, MessageOperations, @@ -1049,6 +1051,9 @@ export default { case "m.room.power_levels": return RoomPowerLevelsChanged; + case "m.room.guest_access": + return RoomGuestAccessChanged; + case "m.room.encryption": return RoomEncrypted; } diff --git a/src/components/CreateRoom.vue b/src/components/CreateRoom.vue index 4093743..03bd20b 100644 --- a/src/components/CreateRoom.vue +++ b/src/components/CreateRoom.vue @@ -13,7 +13,7 @@ arrow_back {{ $t("menu.back") }} - - + --> @@ -75,14 +75,16 @@ - - + + camera_alt - + + + + + {{$t('new_room.create')}} -
-
{{ $t("new_room.join_permissions") }}
+ +
{{ status }}
-
+
{ this.roomId = roomId; @@ -476,7 +495,7 @@ export default { (error.data && error.data.error) || error.message || error.toString(); - this.step = steps.NAME_SET; // revert + this.step = steps.INITIAL; // revert return null; }); }, diff --git a/src/components/CreatedRoomWelcomeHeader.vue b/src/components/CreatedRoomWelcomeHeader.vue index 7197e57..0b8620b 100644 --- a/src/components/CreatedRoomWelcomeHeader.vue +++ b/src/components/CreatedRoomWelcomeHeader.vue @@ -1,12 +1,28 @@ @@ -17,6 +33,30 @@ import roomInfoMixin from "./roomInfoMixin"; export default { name: "CreatedRoomWelcomeHeader", mixins: [roomInfoMixin], + computed: { + roomHistoryDescription() { + const visibility = this.$matrix.getRoomHistoryVisibility(this.room); + switch (visibility) { + case "world_readable": + return this.$t("room_welcome.room_history_is", { + type: this.$t("message.room_history_world_readable"), + }); + case "shared": + return this.$t("room_welcome.room_history_is", { + type: this.$t("message.room_history_shared"), + }); + case "invited": + return this.$t("room_welcome.room_history_is", { + type: this.$t("message.room_history_invited"), + }); + case "joined": + return this.$t("room_welcome.room_history_is", { + type: this.$t("message.room_history_joined"), + }); + } + return null; + }, + }, }; diff --git a/src/components/Home.vue b/src/components/Home.vue index 03dabbd..9109fa0 100644 --- a/src/components/Home.vue +++ b/src/components/Home.vue @@ -1,6 +1,6 @@ diff --git a/src/components/RoomList.vue b/src/components/RoomList.vue index 25a1413..1011331 100644 --- a/src/components/RoomList.vue +++ b/src/components/RoomList.vue @@ -1,6 +1,6 @@