Skip to content

Add canMention permission #6674

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

Merged
BurntimeX merged 1 commit into from
May 16, 2026
Merged

Add canMention permission #6674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion com.woltlab.wcf/templates/shared_wysiwyg.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
list: true,
mark: {if $__wcf->getBBCodeHandler()->isAvailableBBCode('mark')}true{else}false{/if},
media: {if $__wcf->session->getPermission('admin.content.cms.canUseMedia')}true{else}false{/if},
mention: element.dataset.supportMention === "true",
mention: {if $__wcf->session->hasPermission('user.message.canMention')}element.dataset.supportMention === "true"{else}false{/if},
quoteBlock: true,
strikethrough: true,
submitOnEnter: false,
Expand Down
5 changes: 5 additions & 0 deletions com.woltlab.wcf/userGroupOption.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,11 @@ pdf</defaultvalue>
<categoryname>user.message</categoryname>
<optiontype>BBCodeSelect</optiontype>
</option>
<option name="user.message.canMention">
<categoryname>user.message</categoryname>
<optiontype>boolean</optiontype>
<defaultvalue>1</defaultvalue>
</option>
<option name="user.message.canMentionGroups">
<categoryname>user.message</categoryname>
<optiontype>boolean</optiontype>
Expand Down
7 changes: 7 additions & 0 deletions wcfsetup/install/files/lib/data/user/UserAction.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,13 @@ public function getSearchResultList()
);
}

if (
$this->parameters['data']['scope'] === 'mention'
&& !WCF::getSession()->hasPermission('user.message.canMention')
) {
return $list;
}

// find users
$searchString = \addcslashes($searchString, '_%');
$parameters = [
Expand Down
6 changes: 4 additions & 2 deletions wcfsetup/install/files/lib/util/MessageUtil.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public static function getMentionedUserIDs(HtmlInputProcessor $htmlInputProcesso
);

if ($type === 'user') {
if (!empty($attributes[0])) {
if (!empty($attributes[0]) && WCF::getSession()->hasPermission('user.message.canMention')) {
$userIDs[] = $attributes[0];
}
} elseif (WCF::getSession()->hasPermission('user.message.canMentionGroups')) {
Expand Down Expand Up @@ -136,7 +136,9 @@ public static function getMentionedUsers(HtmlInputProcessor $htmlInputProcessor)
}

if ($type === 'user') {
$usernames[] = $element->textContent;
if (WCF::getSession()->hasPermission('user.message.canMention')) {
$usernames[] = $element->textContent;
}
} elseif (WCF::getSession()->hasPermission('user.message.canMentionGroups')) {
$attributes = $htmlInputProcessor->getHtmlInputNodeProcessor()->parseAttributes(
$element->getAttribute('data-attributes')
Expand Down
1 change: 1 addition & 0 deletions wcfsetup/install/lang/de.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,7 @@ Sie erreichen das Fehlerprotokoll unter: {link controller='ExceptionLogView' isE
<item name="wcf.acp.group.option.user.comment.disallowedBBCodes.description"><![CDATA[Die hier ausgewählten BBCodes dürfen von Mitgliedern dieser Benutzergruppe <em>nicht</em> verwendet werden.]]></item>
<item name="wcf.acp.group.option.user.message.disallowedBBCodes"><![CDATA[Nicht erlaubte BBCodes]]></item>
<item name="wcf.acp.group.option.user.message.disallowedBBCodes.description"><![CDATA[Die hier ausgewählten BBCodes dürfen von Mitgliedern dieser Benutzergruppe <em>nicht</em> verwendet werden.]]></item>
<item name="wcf.acp.group.option.user.message.canMention"><![CDATA[Kann andere Benutzer erwähnen]]></item>
<item name="wcf.acp.group.option.user.message.canMentionGroups"><![CDATA[Kann Benutzergruppen erwähnen]]></item>
<item name="wcf.acp.group.option.admin.user.rank.canManageRank"><![CDATA[Kann Benutzerränge verwalten]]></item>
<item name="wcf.acp.group.option.admin.user.canEditActivityPoints"><![CDATA[Kann Aktivitätspunkte bearbeiten]]></item>
Expand Down
1 change: 1 addition & 0 deletions wcfsetup/install/lang/en.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,6 +783,7 @@ You can access the error log at: {link controller='ExceptionLogView' isEmail=tru
<item name="wcf.acp.group.option.user.comment.disallowedBBCodes.description"><![CDATA[Selected BBCodes <em>cannot</em> be used by the users of this user group.]]></item>
<item name="wcf.acp.group.option.user.message.disallowedBBCodes"><![CDATA[Disallowed BBCodes]]></item>
<item name="wcf.acp.group.option.user.message.disallowedBBCodes.description"><![CDATA[Selected BBCodes <em>cannot</em> be used by the users of this user group.]]></item>
<item name="wcf.acp.group.option.user.message.canMention"><![CDATA[Can mention other users]]></item>
<item name="wcf.acp.group.option.user.message.canMentionGroups"><![CDATA[Can mention user groups]]></item>
<item name="wcf.acp.group.option.admin.user.rank.canManageRank"><![CDATA[Can manage user ranks]]></item>
<item name="wcf.acp.group.option.admin.user.canEditActivityPoints"><![CDATA[Can manage activity points]]></item>
Expand Down
Loading