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

Update the bot #1

Merged
merged 140 commits into from
Oct 29, 2024
Merged

Update the bot #1

merged 140 commits into from
Oct 29, 2024

Conversation

MaxxMXSZ
Copy link

No description provided.

flaree and others added 30 commits May 14, 2024 23:27
* Server and user info tools

* Seperate mapping

* Update ballsdex/packages/admin/cog.py

Co-authored-by: MAX <[email protected]>

* Update ballsdex/packages/admin/cog.py

Co-authored-by: MAX <[email protected]>

* precommit

---------

Co-authored-by: MAX <[email protected]>
* admin cog.py improvements

It is just some details, such as adding some brackets, full stops etc.

* fixing

testing if this works

* should fix the issue

moving self bot one line below, should fix the issue

* should work

i had forgotten to replace balls with {settings.collectible_name}s, hence why when i moved self.bot one line down precommit failed

* ...

ty max

* .
* cog,py config typo fix

* components.py config typo fix
* fix

* hot fix

* right pr

* Hotfix :D

* I LOVVVEEE SPLITTING!

i lied

* wording

* isort is my best friend!

i lied again
* change "countryball" to {settings.collectible_name} in many places

* smol mistake fixed

* fix
* change countryball to {settings.collectible_name}

* change countryball to {settings.collectible_name}
This allows forcing the Discord client to refresh the
autocompletion results without changing the query
* Add ball arg to trade history

* trade: fix history query

---------

Co-authored-by: Auguste "laggron42" Charpentier <[email protected]>
it pretty much made the special description all go to the countryball description, sry about that
* yippie

* ..

* ..!

bruh github auto 2 ditto marks when
…#284)

* even more admin cog.py typo fixes,

* happy now pre-commit?

* you better work now
* :D

* add a default

Co-authored-by: Auguste Charpentier <[email protected]>

* Force default prefix

* Forgot cast to string

---------

Co-authored-by: Auguste Charpentier <[email protected]>
* Add confirmation check to balls give for favourites

* appease isort

* fix bugs

---------

Co-authored-by: Auguste "laggron42" Charpentier <[email protected]>
* adding `special` and `shiny` arg to `/balls favourite`

it was missing from there, so why not add it

* those spaces...

---------

Co-authored-by: MAX <[email protected]>
flaree and others added 28 commits September 13, 2024 18:12
* changing collectible_name to plural_collectible_name

* changing collectible_name to plural_collectible_name

* changing collectible_name to plural_collectible_name

* appeasing pre-commit
* adding /player friend policy

* adding friendpolicy to models

* adding the sql file

* making a donationpolicy message ephemeral

* bug fix with /friends add

* small fix, adding correct value

Co-authored-by: MAX <[email protected]>

* adding a policy group cog

* changing the name of friend privacy cmd

* small changes to choices pop for same server privacy option

* fixing pre-commit

---------

Co-authored-by: MAX <[email protected]>
* .

* if staff ignore friend check

* precommit

* de-dupe code
* adding the 2 new policy maps to enums.py

* very important bug fix
* changing /player info to /player stats

* appeasing pre-commit

* appeasing isort

---------

Co-authored-by: MAX <[email protected]>
* .

* defer catching of countryball to avoid i was caught already
… another one (#421)

* adding an active friend request check

* re-adding the description, accidentally removed

* removing unnecessary spaces

---------

Co-authored-by: MAX <[email protected]>
* adding a space in bot response

* using a variable that combines ball_txt and special_txt
…k add (#419)

* not allowing locked balls to be added to a trade with bulk add

* undo change

* re-adding the check + favorited ball check

* adding the await i forgot to add

---------

Co-authored-by: MAX <[email protected]>
* dependencies bump

* updating a lot of dependencies

* leaving aerich to 0.6.3

* update poetry lock file

---------

Co-authored-by: Auguste "laggron42" Charpentier <[email protected]>
* .

* Fix an issue where interacting player doesnt exist

---------

Co-authored-by: MAX <[email protected]>
…411)

* allowing custom cancel/accept edit msg in confirmchoiceview

* appeasing pyright

* appeasing black

* appeasing black again

* adding custom texts in players cog

* adding custom text to balls cog

* adding custom text to admin cog

* adding custom text to trade cog

* adding a comma

* appeasing pre-commit

* appeasing pre-commit again

* de-duping code

* placing default string in the constructor

* reverting change, changing true to false

* appeasing pre-commit
…begin (#439)

* bug fix, better wording + plural check with /trade view

* more precise wording to block checks in /trade begin

* appeasing pre-commit

---------

Co-authored-by: MAX <[email protected]>
…450)

* bug fix, not allowing users to be blocked during active friend req

* appeasing pre-commit

---------

Co-authored-by: MAX <[email protected]>
* poetry: update to python 3.13

* poetry: allow python 3.12

* poetry: remove asyncpg lock
@MaxxMXSZ MaxxMXSZ marked this pull request as ready for review October 29, 2024 22:56
@benektelse benektelse merged commit 3331531 into benektelse:master Oct 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.