flashii/misuzu
flashii/misuzu
1
1
Fork 0
Code Issues Pull requests Releases 159 Wiki Activity Actions

Removed permissions stuff from the User object.

Browse source
This commit is contained in:
flash 2023-07-29 18:15:30 +00:00
parent a89d8d26f4
commit 0158333c90
7 changed files with 45 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public-legacy/comments.php
View file

@ -31,7 +31,7 @@ if($msz->hasActiveBan()) {
$comments = $msz->getComments();
$commentPerms = $currentUserInfo->commentPerms();
$commentPerms = perms_for_comments($currentUserInfo->getId());
$commentId = (string)filter_input(INPUT_GET, 'c', FILTER_SANITIZE_NUMBER_INT);
$commentMode = (string)filter_input(INPUT_GET, 'm');

5
public/index.php
View file

@ -168,6 +168,11 @@ $hasManageAccess = User::hasCurrent()
&& perms_check_user(MSZ_PERMS_GENERAL, User::getCurrent()->getId(), MSZ_PERM_GENERAL_CAN_MANAGE);
Template::set('has_manage_access', $hasManageAccess);
$canViewForumLeaderboard = User::hasCurrent()
&& !$msz->hasActiveBan()
&& perms_check_user(MSZ_PERMS_GENERAL, User::getCurrent()->getId(), MSZ_PERM_FORUM_VIEW_LEADERBOARD);
Template::set('can_view_forum_leaderboard', $canViewForumLeaderboard);
if($inManageMode) {
if(!$hasManageAccess) {
echo render_error(403);

4
src/Comments/CommentsEx.php
View file

@ -19,7 +19,9 @@ class CommentsEx {
if(is_string($category))
$category = $this->comments->ensureCategory($category);
$info->user = User::getCurrent();
$hasUser = User::hasCurrent();
$info->user = $hasUser ? User::getCurrent() : null;
$info->perms = $hasUser ? perms_for_comments($info->user->getId()) : [];
$info->category = $category;
$info->posts = [];

22
src/Users/User.php
View file

@ -314,28 +314,6 @@ class User {
->execute();
}
// TODO: Is this the proper location/implementation for this? (no)
private $commentPermsArray = null;
public function commentPerms(): array {
if($this->commentPermsArray === null)
$this->commentPermsArray = perms_check_user_bulk(MSZ_PERMS_COMMENTS, $this->getId(), [
'can_comment' => MSZ_PERM_COMMENTS_CREATE,
'can_delete' => MSZ_PERM_COMMENTS_DELETE_OWN | MSZ_PERM_COMMENTS_DELETE_ANY,
'can_delete_any' => MSZ_PERM_COMMENTS_DELETE_ANY,
'can_pin' => MSZ_PERM_COMMENTS_PIN,
'can_lock' => MSZ_PERM_COMMENTS_LOCK,
'can_vote' => MSZ_PERM_COMMENTS_VOTE,
]);
return $this->commentPermsArray;
}
private $legacyPerms = null;
public function getLegacyPerms(): array {
if($this->legacyPerms === null)
$this->legacyPerms = perms_get_user($this->getId());
return $this->legacyPerms;
}
/************
* PASSWORD *
************/

11
src/perms.php
View file

@ -261,3 +261,14 @@ function perms_check_user_bulk(string $prefix, ?int $userId, array $set, bool $s
$perms = perms_get_user($userId)[$prefix] ?? 0;
return perms_check_bulk($perms, $set, $strict);
}
function perms_for_comments(string|int $userId): array {
return perms_check_user_bulk(MSZ_PERMS_COMMENTS, (int)$userId, [
'can_comment' => MSZ_PERM_COMMENTS_CREATE,
'can_delete' => MSZ_PERM_COMMENTS_DELETE_OWN | MSZ_PERM_COMMENTS_DELETE_ANY,
'can_delete_any' => MSZ_PERM_COMMENTS_DELETE_ANY,
'can_pin' => MSZ_PERM_COMMENTS_PIN,
'can_lock' => MSZ_PERM_COMMENTS_LOCK,
'can_vote' => MSZ_PERM_COMMENTS_VOTE,
]);
}

51
templates/_layout/comments.twig
View file

@ -1,4 +1,4 @@
{% macro comments_input(category, user, reply_to) %}
{% macro comments_input(category, user, perms, reply_to) %}
{% set reply_mode = reply_to is not null %}
{% from 'macros.twig' import avatar %}
@ -24,10 +24,10 @@
name="comment[text]" placeholder="Share your extensive insights..."></textarea>
<div class="comment__actions">
{% if not reply_mode %}
{% if user.commentPerms.can_pin|default(false) %}
{% if perms.can_pin|default(false) %}
{{ input_checkbox('comment[pin]', 'Pin this comment', false, 'comment__action') }}
{% endif %}
{% if user.commentPerms.can_lock|default(false) %}
{% if perms.can_lock|default(false) %}
{{ input_checkbox('comment[lock]', 'Toggle locked status', false, 'comment__action') }}
{% endif %}
{% endif %}
@ -40,7 +40,7 @@
</form>
{% endmacro %}
{% macro comments_entry(comment, indent, category, user) %}
{% macro comments_entry(comment, indent, category, user, perms) %}
{% from 'macros.twig' import avatar %}
{% from '_layout/input.twig' import input_checkbox_raw %}
@ -61,9 +61,9 @@
{% set isReply = comment.hasParent %}
{% endif %}
{% set hide_details = poster is null or comment.deleted and not user.commentPerms.can_delete_any|default(false) %}
{% set hide_details = poster is null or comment.deleted and not perms.can_delete_any|default(false) %}
{% if user.commentPerms.can_delete_any|default(false) or (not comment.deleted or replies|length > 0) %}
{% if perms.can_delete_any|default(false) or (not comment.deleted or replies|length > 0) %}
<div class="comment{% if comment.deleted %} comment--deleted{% endif %}" id="comment-{{ comment.id }}">
<div class="comment__container">
{% if hide_details %}
@ -106,7 +106,7 @@
</div>
<div class="comment__actions">
{% if not comment.deleted and user is not null %}
{% if user.commentPerms.can_vote|default(false) %}
{% if perms.can_vote|default(false) %}
{% set like_vote_state = userVote > 0 ? 0 : 1 %}
{% set dislike_vote_state = userVote < 0 ? 0 : -1 %}
@ -125,19 +125,19 @@
{% endif %}
</a>
{% endif %}
{% if user.commentPerms.can_comment|default(false) %}
{% if perms.can_comment|default(false) %}
<label class="comment__action comment__action--link" for="comment-reply-toggle-{{ comment.id }}">Reply</label>
{% endif %}
{% if user.commentPerms.can_delete_any|default(false) or (poster.id|default(0) == user.id and user.commentPerms.can_delete|default(false)) %}
{% if perms.can_delete_any|default(false) or (poster.id|default(0) == user.id and perms.can_delete|default(false)) %}
<a class="comment__action comment__action--link comment__action--hide comment__action--delete" data-comment-id="{{ comment.id }}" href="{{ url('comment-delete', {'comment':comment.id}) }}">Delete</a>
{% endif %}
{# if user is not null %}
<a class="comment__action comment__action--link comment__action--hide" href="#">Report</a>
{% endif #}
{% if not isReply and user.commentPerms.can_pin|default(false) %}
{% if not isReply and perms.can_pin|default(false) %}
<a class="comment__action comment__action--link comment__action--hide comment__action--pin" data-comment-id="{{ comment.id }}" data-comment-pinned="{{ comment.pinned ? '1' : '0' }}" href="{{ url('comment-' ~ (comment.pinned ? 'unpin' : 'pin'), {'comment':comment.id}) }}">{{ comment.pinned ? 'Unpin' : 'Pin' }}</a>
{% endif %}
{% elseif user.commentPerms.can_delete_any|default(false) %}
{% elseif perms.can_delete_any|default(false) %}
<a class="comment__action comment__action--link comment__action--restore" data-comment-id="{{ comment.id }}" href="{{ url('comment-restore', {'comment':comment.id}) }}">Restore</a>
{% endif %}
</div>
@ -146,13 +146,13 @@
<div class="comment__replies comment__replies--indent-{{ indent }}" id="comment-{{ comment.id }}-replies">
{% from _self import comments_entry, comments_input %}
{% if user|default(null) is not null and category|default(null) is not null and user.commentPerms.can_comment|default(false) %}
{% if user|default(null) is not null and category|default(null) is not null and perms.can_comment|default(false) %}
{{ input_checkbox_raw('', false, 'comment__reply-toggle', '', false, {'id':'comment-reply-toggle-' ~ comment.id}) }}
{{ comments_input(category, user, comment) }}
{{ comments_input(category, user, perms, comment) }}
{% endif %}
{% if replies|length > 0 %}
{% for reply in replies %}
{{ comments_entry(reply, indent + 1, category, user) }}
{{ comments_entry(reply, indent + 1, category, user, perms) }}
{% endfor %}
{% endif %}
</div>
@ -160,14 +160,11 @@
{% endif %}
{% endmacro %}
{% macro comments_section(category, user) %}
{% if category.category is defined %}
{% set user = category.user %}
{% set posts = category.posts %}
{% set category = category.category %}
{% else %}
{% set posts = category.posts %}
{% endif %}
{% macro comments_section(category) %}
{% set user = category.user %}
{% set posts = category.posts %}
{% set perms = category.perms %}
{% set category = category.category %}
<div class="comments" id="comments">
<div class="comments__input">
@ -179,21 +176,21 @@
<div class="comments__notice">
Posting new comments here is disabled.
</div>
{% elseif not user.commentPerms.can_lock|default(false) and category.locked %}
{% elseif not perms.can_lock|default(false) and category.locked %}
<div class="comments__notice">
This comment section was locked, <time datetime="{{ category.lockedTime|date('c') }}" title="{{ category.lockedTime|date('r') }}">{{ category.lockedTime|time_format }}</time>.
</div>
{% elseif not user.commentPerms.can_comment|default(false) %}
{% elseif not perms.can_comment|default(false) %}
<div class="comments__notice">
You are not allowed to post comments.
</div>
{% else %}
{% from _self import comments_input %}
{{ comments_input(category, user) }}
{{ comments_input(category, user, perms) }}
{% endif %}
</div>
{% if user.commentPerms.can_lock|default(false) and category.locked %}
{% if perms.can_lock|default(false) and category.locked %}
<div class="comments__notice comments__notice--staff">
This comment section was locked, <time datetime="{{ category.lockedTime|date('c') }}" title="{{ category.lockedTime|date('r') }}">{{ category.lockedTime|time_format }}</time>.
</div>
@ -209,7 +206,7 @@
{% if posts|length > 0 %}
{% from _self import comments_entry %}
{% for comment in posts %}
{{ comments_entry(comment, 1, category, user) }}
{{ comments_entry(comment, 1, category, user, perms) }}
{% endfor %}
{% else %}
<div class="comments__none" id="_no_comments_notice_{{ category.id }}">

2
templates/master.twig
View file

@ -61,7 +61,7 @@
{
'title': 'Leaderboard',
'url': url('forum-leaderboard'),
'display': current_user.legacyPerms.forum|default(0)|perms_check(constant('MSZ_PERM_FORUM_VIEW_LEADERBOARD')),
'display': can_view_forum_leaderboard,
},
],
},