Skip to content

Private message #7107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lunyav wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Private message #7107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5ad0a4
FEAT(client, server): Added PrivateMessage ChanACL with translations
Mar 3, 2026
324c9fc
TRANSLATION: Update translation files
Mar 6, 2026
f3a80fe
FIX(server): Add ACL migration + test data
Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/ACL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,8 @@ QString ChanACL::whatsThis(Perm p) {
case Listen:
return tr("This represents the permission to use the listen-feature allowing to listen to a channel "
"without being in it.");
case PrivateMessage:
return tr("This represents the permission to write direct text messages to other users on the server.");
default:
break;
}
Expand Down Expand Up @@ -369,6 +371,8 @@ QString ChanACL::permName(Perm p) {
return tr("Register Self");
case Listen:
return tr("Listen");
case PrivateMessage:
return tr("Private message");
default:
break;
}
Expand Down
3 changes: 2 additions & 1 deletion src/ACL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class ChanACL : public QObject {
TextMessage = 0x200,
MakeTempChannel = 0x400,
Listen = 0x800,
PrivateMessage = 0x1000,

// Root channel only
Kick = 0x10000,
Expand All @@ -42,7 +43,7 @@ class ChanACL : public QObject {

Cached = 0x8000000,
All = Write + Traverse + Enter + Speak + MuteDeafen + Move + MakeChannel + LinkChannel + Whisper + TextMessage
+ MakeTempChannel + Listen + Kick + Ban + Register + SelfRegister + ResetUserContent
+ MakeTempChannel + Listen + PrivateMessage + Kick + Ban + Register + SelfRegister + ResetUserContent
};

Q_DECLARE_FLAGS(Permissions, Perm)
Expand Down
4 changes: 4 additions & 0 deletions src/mumble/ACLEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ ACLEditor::ACLEditor(unsigned int channelid, const MumbleProto::ACL &mea, QWidge
&& (perm == ChanACL::ResetUserContent || perm == ChanACL::Listen)) {
continue;
}
else if (Global::get().sh->m_version < Version::fromComponents(1, 7, 0)
&& (perm == ChanACL::PrivateMessage)) {
continue;
}

QCheckBox *qcb;
l = new QLabel(name, qgbACLpermissions);
Expand Down
21 changes: 17 additions & 4 deletions src/mumble/MainWindow.cpp
View file
Open in desktop
Comment thread
lunyav marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -2057,7 +2057,6 @@ void MainWindow::on_qaUserBan_triggered() {

void MainWindow::on_qaUserTextMessage_triggered() {
ClientUser *p = getContextMenuUser();

if (!p)
return;

Expand Down Expand Up @@ -2627,7 +2626,12 @@ void MainWindow::updateMenuPermissions() {
qaUserDeaf->setEnabled(p & (ChanACL::Write | ChanACL::MuteDeafen)
&& ((target.user != user) || target.user->bDeaf));
qaUserPrioritySpeaker->setEnabled(p & (ChanACL::Write | ChanACL::MuteDeafen));
qaUserTextMessage->setEnabled(p & (ChanACL::Write | ChanACL::TextMessage));
if (Global::get().sh && (Global::get().sh->m_version >= Version::fromComponents(1, 7, 0))) {
qaUserTextMessage->setEnabled(p & (ChanACL::Write | ChanACL::PrivateMessage));
}
else {
qaUserTextMessage->setEnabled(p & (ChanACL::Write | ChanACL::TextMessage));
}
qaUserInformation->setEnabled((Global::get().pPermissions & (ChanACL::Write | ChanACL::Register))
|| (p & (ChanACL::Write | ChanACL::Enter)) || (target.user == user));
} else {
Expand All @@ -2653,11 +2657,20 @@ void MainWindow::updateMenuPermissions() {
qaChannelSendMessage->setEnabled(p & (ChanACL::Write | ChanACL::TextMessage));
qaChannelHide->setEnabled(target.channel);
qaChannelPin->setEnabled(target.channel);

bool chatBarEnabled = false;
if (Global::get().uiSession) {
if (Global::get().s.bChatBarUseSelection && (target.channel || target.user)) {
chatBarEnabled = p & (ChanACL::Write | ChanACL::TextMessage);
if (Global::get().sh && (Global::get().sh->m_version >= Version::fromComponents(1, 7, 0))) {
if (target.user) {
chatBarEnabled = p & (ChanACL::Write | ChanACL::PrivateMessage);
}
else if (target.channel) {
chatBarEnabled = p & (ChanACL::Write | ChanACL::TextMessage);
}
}
else{
chatBarEnabled = p & (ChanACL::Write | ChanACL::TextMessage);
}
} else if (homec) {
chatBarEnabled = homep & (ChanACL::Write | ChanACL::TextMessage);
}
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_ar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2988,6 +2988,14 @@ Are you sure you wish to replace your certificate?
<source>Reset User Content</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This represents the permission to write direct text messages to other users on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Private message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatbarTextEdit</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_bg.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2985,6 +2985,14 @@ Are you sure you wish to replace your certificate?
<source>Reset User Content</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This represents the permission to write direct text messages to other users on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Private message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatbarTextEdit</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_br.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2984,6 +2984,14 @@ Are you sure you wish to replace your certificate?
<source>Reset User Content</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This represents the permission to write direct text messages to other users on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Private message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatbarTextEdit</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_ca.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3025,6 +3025,14 @@ Esteu segur que vols substituir el vostre certificat?
<source>Reset User Content</source>
<translation>Reinicia el Contingut de l&apos;Usuaei</translation>
</message>
<message>
<source>This represents the permission to write direct text messages to other users on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Private message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatbarTextEdit</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_cs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3026,6 +3026,14 @@ Jste si jisti, že chcete certifikát nahradit?
<source>Reset User Content</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This represents the permission to write direct text messages to other users on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Private message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatbarTextEdit</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2988,6 +2988,14 @@ Are you sure you wish to replace your certificate?
<source>Reset User Content</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This represents the permission to write direct text messages to other users on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Private message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatbarTextEdit</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_da.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3025,6 +3025,14 @@ Er du sikker på du vil erstatte dit certifikat?
<source>Reset User Content</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This represents the permission to write direct text messages to other users on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Private message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatbarTextEdit</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_de.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3025,6 +3025,14 @@ Sind Sie sicher, dass Sie Ihr Zertifikat ersetzen möchten?
<source>Reset User Content</source>
<translation>Setze Benutzer-Inhalt zurück</translation>
</message>
<message>
<source>This represents the permission to write direct text messages to other users on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Private message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatbarTextEdit</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_el.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3025,6 +3025,14 @@ Are you sure you wish to replace your certificate?
<source>Reset User Content</source>
<translation>Επαναφορά περιεχομένου χρήστη</translation>
</message>
<message>
<source>This represents the permission to write direct text messages to other users on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Private message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatbarTextEdit</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2983,6 +2983,14 @@ Are you sure you wish to replace your certificate?
<source>Reset User Content</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This represents the permission to write direct text messages to other users on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Private message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatbarTextEdit</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_en_GB.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3025,6 +3025,14 @@ Are you sure you wish to replace your certificate?
<source>Reset User Content</source>
<translation>Reset User Content</translation>
</message>
<message>
<source>This represents the permission to write direct text messages to other users on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Private message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatbarTextEdit</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_eo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2992,6 +2992,14 @@ Are you sure you wish to replace your certificate?
<source>Reset User Content</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This represents the permission to write direct text messages to other users on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Private message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatbarTextEdit</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3025,6 +3025,14 @@ Are you sure you wish to replace your certificate?
<source>Reset User Content</source>
<translation>Restablecer contenido del usuario</translation>
</message>
<message>
<source>This represents the permission to write direct text messages to other users on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Private message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatbarTextEdit</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_et.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2985,6 +2985,14 @@ Are you sure you wish to replace your certificate?
<source>Reset User Content</source>
<translation>Nulli kasutaja sisu</translation>
</message>
<message>
<source>This represents the permission to write direct text messages to other users on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Private message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatbarTextEdit</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_eu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2995,6 +2995,14 @@ adierazten du.</translation>
<source>Reset User Content</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This represents the permission to write direct text messages to other users on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Private message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatbarTextEdit</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_fa_IR.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2985,6 +2985,14 @@ Are you sure you wish to replace your certificate?
<source>Reset User Content</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This represents the permission to write direct text messages to other users on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Private message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatbarTextEdit</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_fi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3025,6 +3025,14 @@ Haluatko varmasti korvata varmenteen?
<source>Reset User Content</source>
<translation>Poista käyttäjän sisältö</translation>
</message>
<message>
<source>This represents the permission to write direct text messages to other users on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Private message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatbarTextEdit</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_fr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3025,6 +3025,14 @@ Are you sure you wish to replace your certificate?
<source>Reset User Content</source>
<translation>Réinitialiser le contenu utilisateur</translation>
</message>
<message>
<source>This represents the permission to write direct text messages to other users on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Private message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatbarTextEdit</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_gl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2986,6 +2986,14 @@ Are you sure you wish to replace your certificate?
<source>Reset User Content</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This represents the permission to write direct text messages to other users on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Private message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatbarTextEdit</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_he.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3023,6 +3023,14 @@ Are you sure you wish to replace your certificate?
<source>Reset User Content</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This represents the permission to write direct text messages to other users on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Private message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatbarTextEdit</name>
Expand Down
Loading
Loading