Skip to content
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.

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

Permissions v2 - Redo for merge conflicts #1328

Merged
merged 48 commits into from May 5, 2022
Merged

Permissions v2 - Redo for merge conflicts #1328

merged 48 commits into from May 5, 2022

Conversation

krittick
Copy link
Contributor

@krittick krittick commented May 5, 2022

Summary

This is a copy of #1183 to re-do the merge conflict resolution after it was previously broken

Checklist

  • If code changes were made then they have been tested.
    • I have updated the documentation to reflect the changes.
  • If type: ignore comments were used, a comment is also left explaining why
  • This PR fixes an issue.
  • This PR adds something new (e.g. new method or parameters).
  • This PR is a breaking change (e.g. methods or parameters removed/renamed)
  • This PR is not a code change (e.g. documentation, README, typehinting, examples, ...)

Dorukyum and others added 30 commits January 15, 2022 20:56
Implement application command permissions v2
# Conflicts:
#	discord/bot.py
#	discord/commands/core.py
@krittick krittick self-assigned this May 5, 2022
@krittick krittick marked this pull request as draft May 5, 2022 22:52
@codecov
Copy link

codecov bot commented May 5, 2022

Codecov Report

Merging #1328 (c1f93b9) into master (6a21ede) will increase coverage by 0.08%.
The diff coverage is 14.75%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1328      +/-   ##
==========================================
+ Coverage   33.42%   33.51%   +0.08%     
==========================================
  Files          93       93              
  Lines       17621    17563      -58     
==========================================
- Hits         5890     5886       -4     
+ Misses      11731    11677      -54     
Flag Coverage Δ
pytest 33.51% <14.75%> (+0.08%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
discord/audit_logs.py 28.57% <ø> (ø)
discord/bot.py 18.87% <ø> (+1.37%) ⬆️
discord/commands/core.py 17.79% <0.00%> (-0.21%) ⬇️
discord/commands/permissions.py 28.57% <21.05%> (+10.38%) ⬆️
discord/enums.py 77.88% <25.00%> (-0.27%) ⬇️
discord/http.py 23.41% <40.00%> (+0.03%) ⬆️
discord/state.py 14.56% <50.00%> (+0.06%) ⬆️
discord/types/interactions.py 99.28% <100.00%> (ø)
discord/sinks/core.py 39.36% <0.00%> (-1.07%) ⬇️
discord/player.py 24.83% <0.00%> (-0.33%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6a21ede...c1f93b9. Read the comment docs.

@krittick krittick added this to In progress in v2.0 via automation May 5, 2022
@krittick krittick added this to the v2.0 milestone May 5, 2022
@krittick krittick added bypass-review Bypasses reviews for urgent pull requests involving critical code or documentation fixes. feature Implements a feature and removed status: in progress Work in Progess labels May 5, 2022
@krittick krittick marked this pull request as ready for review May 5, 2022 23:26
@krittick krittick merged commit 68752f1 into master May 5, 2022
v2.0 automation moved this from In progress to Done May 5, 2022
@krittick krittick deleted the permissions-v2 branch May 5, 2022 23:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bypass-review Bypasses reviews for urgent pull requests involving critical code or documentation fixes. feature Implements a feature priority: high High Priority
Projects
Status: No status
v2.0
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

6 participants