krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(groups): add back string

Browse Source 
also fix party seeking analytics and a spurious text decoration
This commit is contained in:
SabreCat
2023-08-07 15:55:29 -05:00
parent 9fa355fbcc
commit 1371b80635
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
website/client/src/components/header/menu.vue
View File

@@ -615,6 +615,7 @@ body.modal-open #habitica-menu {
&:hover { &:hover {
background: $purple-300; background: $purple-300;
text-decoration: none;
&:last-child { &:last-child {
border-bottom-right-radius: 5px; border-bottom-right-radius: 5px;

1
website/common/locales/en/groups.json
View File

@@ -31,6 +31,7 @@
"invitationAcceptedHeader": "Your Invitation has been Accepted", "invitationAcceptedHeader": "Your Invitation has been Accepted",
"invitationAcceptedBody": "<%= username %> accepted your invitation to <%= groupName %>!", "invitationAcceptedBody": "<%= username %> accepted your invitation to <%= groupName %>!",
"systemMessage": "System Message", "systemMessage": "System Message",
"newMsgGuild": "<span class=\"notification-bold-blue\"><%- name %></span> has new posts",
"newMsgParty": "Your Party, <span class=\"notification-bold-blue\"><%- name %></span>, has new posts", "newMsgParty": "Your Party, <span class=\"notification-bold-blue\"><%- name %></span>, has new posts",
"chat": "Chat", "chat": "Chat",
"sendChat": "Send Chat", "sendChat": "Send Chat",

3
website/server/controllers/api-v3/groups.js
View File

@@ -565,6 +565,7 @@ api.joinGroup = {
if (!group) throw new NotFound(res.t('groupNotFound')); if (!group) throw new NotFound(res.t('groupNotFound'));
let isUserInvited = false; let isUserInvited = false;
const seekingParty = Boolean(user.party.seeking);
if (group.type === 'party') { if (group.type === 'party') {
// Check if was invited to party // Check if was invited to party
@@ -730,7 +731,7 @@ api.joinGroup = {
invited: isUserInvited, invited: isUserInvited,
}; };
if (group.type === 'party') { if (group.type === 'party') {
analyticsObject.seekingParty = Boolean(user.party.seeking); analyticsObject.seekingParty = seekingParty;
} }
if (group.privacy === 'public') { if (group.privacy === 'public') {
analyticsObject.groupName = group.name; analyticsObject.groupName = group.name;