Skip to content

Commit

Permalink
Group edit mode visibility dropdown
Browse files Browse the repository at this point in the history
  • Loading branch information
@Natsumi-sama
Natsumi-sama committed Nov 15, 2024
1 parent 976c9ff commit de750c0
Show file tree
Hide file tree
Showing 4 changed files with 104 additions and 44 deletions.
8 changes: 6 additions & 2 deletions html/src/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16960,7 +16960,9 @@ speechSynthesis.getVoices();
API.currentUserGroups.clear();
args.json.forEach((group) => {
var ref = API.applyGroup(group);
API.currentUserGroups.set(group.id, ref);
if (!API.currentUserGroups.has(group.id)) {
API.currentUserGroups.set(group.id, ref);
}
});
this.saveCurrentUserGroups();
}
Expand Down Expand Up @@ -17007,7 +17009,9 @@ speechSynthesis.getVoices();
API.currentUserGroups.clear();
for (var group of args.json) {
var ref = API.applyGroup(group);
API.currentUserGroups.set(group.id, ref);
if (!API.currentUserGroups.has(group.id)) {
API.currentUserGroups.set(group.id, ref);
}
}
await API.getGroupPermissions({ userId: API.currentUser.id });
this.saveCurrentUserGroups();
Expand Down
87 changes: 62 additions & 25 deletions html/src/classes/groups.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ export default class extends baseClass {

API.$on('GROUP', function (args) {
args.ref = this.applyGroup(args.json);
this.cachedGroups.set(args.ref.id, args.ref);
if (this.currentUserGroups.has(args.ref.id)) {
this.currentUserGroups.set(args.ref.id, args.ref);
}
});

API.$on('GROUP', function (args) {
Expand Down Expand Up @@ -245,12 +241,6 @@ export default class extends baseClass {
$app.groupDialog.ref.isRepresenting =
args.params.isRepresenting;
}
if (
$app.userDialog.visible &&
$app.userDialog.id === this.currentUser.id
) {
$app.getCurrentUserRepresentedGroup();
}
});

/**
Expand Down Expand Up @@ -1408,10 +1398,36 @@ export default class extends baseClass {
}
}
}
if (json.myMember) {
if (typeof json.myMember.roleIds === 'undefined') {
// keep roleIds
json.myMember.roleIds = ref.myMember.roleIds;
}
Object.assign(ref.myMember, json.myMember);
}
Object.assign(ref, json);
}
// update myMember without fetching member
if (typeof json.memberVisibility !== 'undefined') {
ref.myMember.visibility = json.memberVisibility;
}
if (typeof json.isRepresenting !== 'undefined') {
ref.myMember.isRepresenting = json.isRepresenting;
}
if (typeof json.membershipStatus !== 'undefined') {
ref.myMember.membershipStatus = json.membershipStatus;
}
if (typeof json.roleIds !== 'undefined') {
ref.myMember.roleIds = json.roleIds;
}
ref.$url = `https://vrc.group/${ref.shortCode}.${ref.discriminator}`;
this.applyGroupLanguage(ref);

var currentUserGroupRef = this.currentUserGroups.get(ref.id);
if (currentUserGroupRef && currentUserGroupRef !== ref) {
this.currentUserGroups.set(ref.id, ref);
}

return ref;
};

Expand All @@ -1430,6 +1446,28 @@ export default class extends baseClass {
}
}
}
// update myMember without fetching member
if (json.userId === this.currentUser.id) {
var ref = this.cachedGroups.get(json.groupId);
if (typeof ref !== 'undefined') {
this.$emit('GROUP', {
json: {
...ref,
memberVisibility: json.visibility,
isRepresenting: json.isRepresenting,
isSubscribedToAnnouncements:
json.isSubscribedToAnnouncements,
joinedAt: json.joinedAt,
roleIds: json.roleIds,
membershipStatus: json.membershipStatus
},
params: {
groupId: json.groupId
}
});
}
}

return json;
};

Expand Down Expand Up @@ -1999,7 +2037,7 @@ export default class extends baseClass {
API.cachedGroups.clear();
API.currentUserGroups.clear();
for (var group of savedGroups) {
var ref = {
var json = {
id: group.id,
name: group.name,
iconUrl: group.iconUrl,
Expand All @@ -2009,7 +2047,7 @@ export default class extends baseClass {
roleIds: group.roleIds
}
};
API.cachedGroups.set(group.id, ref);
var ref = API.applyGroup(json);
API.currentUserGroups.set(group.id, ref);
}

Expand Down Expand Up @@ -2358,8 +2396,7 @@ export default class extends baseClass {
iconUrl: ''
});
API.getGroup({ groupId, includeRoles: true }).then((args) => {
var ref = API.applyGroup(args.json);
API.currentUserGroups.set(groupId, ref);
API.applyGroup(args.json); // make sure this runs before saveCurrentUserGroups
this.saveCurrentUserGroups();
return args;
});
Expand Down Expand Up @@ -3496,19 +3533,19 @@ export default class extends baseClass {
async addGroupMemberToSelection(userId) {
var D = this.groupMemberModeration;

// fetch memeber if there is one
// fetch member if there is one
// banned members don't have a user object

var memeber = {};
var memeberArgs = await API.getGroupMember({
var member = {};
var memberArgs = await API.getGroupMember({
groupId: D.id,
userId
});
if (memeberArgs.json) {
memeber = API.applyGroupMember(memeberArgs.json);
if (memberArgs.json) {
member = API.applyGroupMember(memberArgs.json);
}
if (memeber.user) {
D.selectedUsers.set(memeber.userId, memeber);
if (member.user) {
D.selectedUsers.set(member.userId, member);
D.selectedUsersArray = Array.from(D.selectedUsers.values());
this.groupMemberModerationTableForceUpdate++;
return;
Expand All @@ -3517,11 +3554,11 @@ export default class extends baseClass {
var userArgs = await API.getCachedUser({
userId
});
memeber.userId = userArgs.json.id;
memeber.user = userArgs.json;
memeber.displayName = userArgs.json.displayName;
member.userId = userArgs.json.id;
member.user = userArgs.json;
member.displayName = userArgs.json.displayName;

D.selectedUsers.set(memeber.userId, memeber);
D.selectedUsers.set(member.userId, member);
D.selectedUsersArray = Array.from(D.selectedUsers.values());
this.groupMemberModerationTableForceUpdate++;
}
Expand Down
26 changes: 11 additions & 15 deletions html/src/classes/websocket.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -466,32 +466,28 @@ export default class extends baseClass {
break;

case 'group-member-updated':
var groupId = content.member.groupId;
var member = content.member;
if (!member) {
console.error(
'group-member-updated missing member',
content
);
break;
}
var groupId = member.groupId;
if (
$app.groupDialog.visible &&
$app.groupDialog.id === groupId
) {
$app.getGroupDialogGroup(groupId);
}
this.$emit('GROUP:MEMBER', {
json: content.member,
json: member,
params: {
groupId
}
});
console.log('group-member-updated', content);

// content {
// groupId: string,
// id: string,
// isRepresenting: boolean,
// isSubscribedToAnnouncements: boolean,
// joinedAt: string,
// membershipStatus: string,
// roleIds: string[],
// userId: string,
// visibility: string
// }
console.log('group-member-updated', member);
break;

case 'instance-queue-joined':
Expand Down
27 changes: 25 additions & 2 deletions html/src/mixins/dialogs/userDialog.pug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,11 +325,34 @@ mixin userDialog()
span.extra
el-tooltip(v-if="group.isRepresenting" placement="top" :content="$t('dialog.group.members.representing')")
i.el-icon-collection-tag(style="margin-right:5px")
el-tooltip(v-if="group.memberVisibility !== 'visible'" placement="top")
el-tooltip(v-if="group.myMember.visibility !== 'visible'" placement="top")
template(#content)
span {{ $t('dialog.group.members.visibility') }} {{ group.memberVisibility }}
span {{ $t('dialog.group.members.visibility') }} {{ group.myMember.visibility }}
i.el-icon-view(style="margin-right:5px")
span ({{ group.memberCount }})
el-dropdown(@click.native.stop :disabled="group.privacy !== 'default'" trigger="click" size="small" style="margin-right:5px")
el-button(size="mini")
span(v-if="group.myMember.visibility === 'visible'") {{ $t('dialog.group.tags.visible') }}
span(v-else-if="group.myMember.visibility === 'friends'") {{ $t('dialog.group.tags.friends') }}
span(v-else-if="group.myMember.visibility === 'hidden'") {{ $t('dialog.group.tags.hidden') }}
span(v-else) {{ group.myMember.visibility }}
i.el-icon-arrow-down.el-icon--right(style="margin-left:5px")
el-dropdown-menu
el-dropdown-item(@click.native="setGroupVisibility(group.id, 'visible')") #[i.el-icon-check(v-if="group.myMember.visibility === 'visible'")] {{ $t('dialog.group.actions.visibility_everyone') }}
el-dropdown-item(@click.native="setGroupVisibility(group.id, 'friends')") #[i.el-icon-check(v-if="group.myMember.visibility === 'friends'")] {{ $t('dialog.group.actions.visibility_friends') }}
el-dropdown-item(@click.native="setGroupVisibility(group.id, 'hidden')") #[i.el-icon-check(v-if="group.myMember.visibility === 'hidden'")] {{ $t('dialog.group.actions.visibility_hidden') }}

//- JSON is missing isSubscribedToAnnouncements, can't be implemented
//- el-dropdown(@click.native.stop trigger="click" size="small" style="margin-right:5px")
//- el-tooltip(placement="top" :disabled="hideTooltips")
//- template(#content)
//- span(v-if="group.myMember.isSubscribedToAnnouncements") {{ $t('dialog.group.actions.unsubscribe') }}
//- span(v-else) {{ $t('dialog.group.actions.subscribe') }}
//- el-button(v-if="group.myMember.isSubscribedToAnnouncements" @click.stop="setGroupSubscription(group.id, false)" circle size="mini")
//- i.el-icon-chat-line-square
//- el-button(v-else circle @click.stop="setGroupSubscription(group.id, true)" size="mini")
//- i.el-icon-chat-square(style="color:#f56c6c")
el-tooltip(placement="right" :content="$t('dialog.user.groups.leave_group_tooltip')" :disabled="hideTooltips")
el-button(v-if="shiftHeld" @click.stop="leaveGroupPrompt(group.id)" size="mini" icon="el-icon-close" circle style="color:#f56c6c;margin-left:5px")
el-button(v-else @click.stop="leaveGroupPrompt(group.id)" size="mini" icon="el-icon-delete" circle style="margin-left:5px")
Expand Down

0 comments on commit de750c0

Please sign in to comment.