Compare commits

..

1 Commits

Author SHA1 Message Date
Kwoth
7d5c4666b8 Fixed VoiceXP bug, closes #374. Upped version to 4.3.4, Updated changelog 2022-08-07 13:07:51 +02:00
263 changed files with 2139 additions and 88896 deletions

View File

@@ -104,7 +104,7 @@ publish-medusa-package:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_TAG - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_TAG
script: script:
- LAST_TAG=$(git describe --tags --abbrev=0) - LAST_TAG=$(git describe --tags --abbrev=0)
- if [ $CI_COMMIT_TAG ];then MEDUSA_VERSION="$CI_COMMIT_TAG"; else MEDUSA_VERSION="$LAST_TAG-$CI_COMMIT_SHORT_SHA"; fi - if [ $CI_COMMIT_TAG ];then MEDUSA_VERSION="$CI_COMMIT_TAG"; else MEDUSA_VERSION="$LAST_TAG-$CI_COMMIT_SHA"; fi
- cd src/Nadeko.Medusa/ - cd src/Nadeko.Medusa/
- dotnet pack -c Release /p:Version=$MEDUSA_VERSION -o bin/Release/packed - dotnet pack -c Release /p:Version=$MEDUSA_VERSION -o bin/Release/packed
- dotnet nuget push bin/Release/packed/ --source https://www.myget.org/F/nadeko/api/v2/package --api-key "$MYGET_API_KEY" - dotnet nuget push bin/Release/packed/ --source https://www.myget.org/F/nadeko/api/v2/package --api-key "$MYGET_API_KEY"

View File

@@ -2,169 +2,7 @@
Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
## [4.3.11] - 21.01.2023 ## Unreleased
### Added
- Added `.doas` Bot owner only command
- Added `.stickeradd` command
### Changed
- `.waifuinfo` optimized
- You can now specify an optional custom message in `.feed` and `.yun` which will be posted along with an update
- Greet/bye messages will now get disabled if they're set to a deleted/unknown channel
- Updated response strings
- `.translate` now supports many more languages
- `.translangs` prettier output
### Fixed
- Added logging for thread events
- Fixed a bug for `.quotedeleteauthor` causing the executing user to delete own messages
- Fixed TimeOut punishment not alklowing duration
- Fixed a nullref in streamrole service
- Fixed some potential causes for ratelimit due to default message retry settings
- Fixed a patron rewards bug caused by monthly donation checking not accounting for year increase
- Fixed a patron rewards bug for users who connected the same discord account with multiple patreon accounts
- `.deletecurrency` will now also reset banked currency
- Fixed DMHelpText reply
- `.h` command show now properly show both channel and server user permission requirements
- Many fixes and improvements to medusa system
- Fixed trivia --nohint
- `.joinrace` will no longer fail if the user isn't in the database yet
## [4.3.10] - 10.11.2022
### Added
- `.filterlist` / `.fl` command which lists link and invite filtering channels and status
- Added support for `%target%` placeholder in `.alias` command
- Added .forwardtochannel which will forward messages to the current channel. It has lower priority than fwtoall
- Added .exprtoggleglobal / .extg which can be used to toggle usage of global expressions on the server
### Changed
- .meload and .meunload are now case sensitive. Previously loaded medusae may need to be reloaded or data/medusae/medusa.yml may need to be edited manually
- Several club related command have their error messages improved
- Updated help text for .antispam and .antiraid
- You can now specify time and date (time is optional) in `.remind` command instead of relative time, in the format `HH:mm dd.MM.YYYY`
- OwnerId will be automatically added to `creds.yml` at bot startup if it's missing
### Fixed
- Fixed `.cmdcd` console error
- Fixed an error when currency is add per xp
- Fixed an issue preventing execution of expressions starting with @Bot when cleverbot is enabled on the server
- Fixed `.feedadd`
- Fixed `.prune @target` not working
- Medusa modules (sneks) should now inherit medusa description when listed in .mdls command
- Fixed command cooldown calculation
## [4.3.9] - 12.10.2022
### Added
- `.betstats` shows sum of all bets, payouts and the payout rate in %. Updates once an hour
### Changed
- `.betstats` looks way better (except on Mac)
- `.feedadd` errors clarified and separated in individual error messages for each issue.
- `.clubban` and `.clubunban` errors clarified and separated in individual error messages for each issue.
- `.clubapply` better error messages
### Fixed
- `.timely` 'Remind' button fixed in DMs
- `.cmdcd` database bugs fixed
- Fixed bugged mysql and postgresql migrations
- Fixed issues with lodaing medusae due to strict versioning
### Removed
- `.slotstats` Superseded by `.betstats`
## [4.3.8] - 02.10.2022
### Added
- Added `.autopublish` command which will automatically publish messages posted in the channel.
- Added `--after <messageid>` option to prune which will make prune only delete messages after the specified message id.
### Changed
- `.prune` options `--after` and `--safe` are now proper command options, and will show in .h help
- `.cmdcd` code mostly rewritten, slight QoL improvements.
- Clarified `.remind` permission requirements in help text
- `.cmdcds` looks a little better, and is paginated
### Fixed
- Fixed trivia bugs
- Fixed `.yun` not working with channels with underscore in the name
## [4.3.7] - 14.09.2022
### Added
- Added `.exprdelserv` (.exds) to completement .exas. Deletes an expression on the current server and is susceptible to .dpo, unlike .exd
- Added `.shopreq` which lets you set role requirement for specific shop items
- Added `.shopbuy` alias to `.buy`
### Fixed
- Fixed `.convertlist` showing currencies twice (this may not apply to existing users and it may require you to manually remove all currencies from units.json)
### Removed
- Removed `Viewer` field from stream online notification as it is (almost?) always 0.
## [4.3.6] - 08.09.2022
### Added
- Added `.expraddserver` (.exas) which will server as a server-only alternative to '.exa' in case users want to override default Admin permissions with .dpo
- Added .banprune command which sets how many days worth of messages will be pruned when bot (soft)bans a person either through a command or another punishment feature.
- Added .qdelauth - Delete all quotes by the specified author on this server. If you target yourself - no permission required
- Added `.timeout` command
- Added an option to award currency based on received xp
### Changed
- Reminders now have embed support, but plaintext field is not supported.
- User friendlier errors when parsing a number in a command fails
### Fixed
- Awarded xp is now correctly used in level up calculations
## [4.3.5] - 17.08.2022
### Added
- Added a 'Use' button when a user already owns an item
- Added a 'Pull Again' button to slots
- Added `.roleinfo` command
- Added `.emojiremove` command
- Added `.threadcreate` and `.threaddelete` commands
- Added `.bank seize` / `.bank award` owner only commands
### Changed
- Running a .timely command early now shows a pending color
- .xp system is once again no longer opt in for servers
- It's still opt-in for global and requires users to run .xp at least once in order to start gaining global xp
### Fixed
- Fixed users not getting club xp
## [4.3.4] - 07.08.2022
### Fixed
- Fixed users getting XP out of nowhere while voice xp is enabled
## [4.3.3] - 06.08.2022 ## [4.3.3] - 06.08.2022
@@ -177,7 +15,7 @@ Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.
### Changed ### Changed
- Updated position of Username and Club name on the .xp card - Updated position of Username and Club name on the .xp card
- Improved text visibility on the .xp card - Improved text visibility on the .xp card
### Fixed ### Fixed
@@ -250,7 +88,7 @@ Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.
- [dev] No longer using generator and partial methods for commands - [dev] No longer using generator and partial methods for commands
### Fixed ### Fixed
- `.slot` will now show correct multipliers if they've been modified - `.slot` will now show correct multipliers if they've been modified
- Fix patron errors showing up even with permissions disabling the command - Fix patron errors showing up even with permissions disabling the command
- Fixed an issue with voice xp breaking xp gain. - Fixed an issue with voice xp breaking xp gain.
@@ -305,14 +143,14 @@ Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.
### Fixed ### Fixed
- Fixed `.draw` command - Fixed `.draw` command
## [4.2.10] - 29.06.2022 ## [4.2.10] - 29.06.2022
- Fixed currency generation working only once - Fixed currency generation working only once
## [4.2.9] - 25.06.2022 ## [4.2.9] - 25.06.2022
### Fixed ### Fixed
- Fixed `creds_example.yml` misssing from output directory - Fixed `creds_example.yml` misssing from output directory
@@ -472,7 +310,7 @@ Added `.patron` and `.patronmessage` commands
- `ytdataapi` will use the official google api (requires `GoogleApiKey` specified in `creds.yml`) and YoutubeDataApi enabled in the dev console - `ytdataapi` will use the official google api (requires `GoogleApiKey` specified in `creds.yml`) and YoutubeDataApi enabled in the dev console
- `ytdl` will use `youtube-dl` program from the host machine. It must be downloaded and it's location must be added to path env variable. - `ytdl` will use `youtube-dl` program from the host machine. It must be downloaded and it's location must be added to path env variable.
- `ytdlp` will use `yt-dlp` program from the host machine. Same as `youtube-dl` - must be in path env variable. - `ytdlp` will use `yt-dlp` program from the host machine. Same as `youtube-dl` - must be in path env variable.
- `invidious` will use one of invidious instances specified in the `invidiousInstances` property. Very good. - `invidious` will use one of invidious instances specified in the `invidiousInstances` property. Very good.
- `.google`, `.youtube` and `.image` moved to the new Search group - `.google`, `.youtube` and `.image` moved to the new Search group
@@ -492,19 +330,19 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
- `.feed` urls which error for more than 100 times will be automatically removed. - `.feed` urls which error for more than 100 times will be automatically removed.
- `.ve` is now enabled by default - `.ve` is now enabled by default
- [dev] nadeko interaction slightly improved to make it less nonsense (they still don't make sense) - [dev] nadeko interaction slightly improved to make it less nonsense (they still don't make sense)
- [dev] RewardedUsers table slightly changed to make it more general - [dev] RewardedUsers table slightly changed to make it more general
- [dev] renamed `// todo`s which aren't planned soon to `// FUTURE` - [dev] renamed `// todo`s which aren't planned soon to `// FUTURE`
- [dev] currency rewards have been reimplemented and moved to a separate service - [dev] currency rewards have been reimplemented and moved to a separate service
### Fixed ### Fixed
- `.rh` no longer needs quotes for multi word roles - `.rh` no longer needs quotes for multi word roles
- `.deletexp` will now properly delete server xp too - `.deletexp` will now properly delete server xp too
- Fixed `.crypto` sparklines - Fixed `.crypto` sparklines
- [dev] added support for configs to properly parse enums without case sensitivity (ConfigParsers.InsensitiveEnum) - [dev] added support for configs to properly parse enums without case sensitivity (ConfigParsers.InsensitiveEnum)
- [dev] Fixed a bug in .gencmdlist - [dev] Fixed a bug in .gencmdlist
- [dev] small fixes to creds provider - [dev] small fixes to creds provider
### Removed ### Removed
@@ -537,7 +375,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
## [4.1.3] - 06.05.2022 ## [4.1.3] - 06.05.2022
### Added ### Added
- Added support for embed arrays in commands such as .say, .greet, .bye, etc... - Added support for embed arrays in commands such as .say, .greet, .bye, etc...
- Website to create them is live at eb.nadeko.bot (old one is moved to oldeb.nadeko.bot) - Website to create them is live at eb.nadeko.bot (old one is moved to oldeb.nadeko.bot)
@@ -550,18 +388,18 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
- Users can deposit, withdraw and check the balance of their currency in the bank. - Users can deposit, withdraw and check the balance of their currency in the bank.
- Users can't check other user's bank balances. - Users can't check other user's bank balances.
- Added a button on a .$ command which, when clicked, sends you a message with your bank balance that only you can see. - Added a button on a .$ command which, when clicked, sends you a message with your bank balance that only you can see.
- Added `.h <command group>` - Added `.h <command group>`
- Using this command will list all commands in the specified group - Using this command will list all commands in the specified group
- Atm only .bank is a proper group (`.h bank`) - Atm only .bank is a proper group (`.h bank`)
- Added "Bank Accounts" entry to `.economy` - Added "Bank Accounts" entry to `.economy`
### Changed ### Changed
- Reaction roles rewritten completely - Reaction roles rewritten completely
- Supports multiple exclusivity groups per message - Supports multiple exclusivity groups per message
- Supports level requirements - Supports level requirements
- However they can only be added one by one - However they can only be added one by one
- Use the following commands for more information - Use the following commands for more information
- `.h .reroa` - `.h .reroa`
- `.h .reroli` - `.h .reroli`
- `.h .rerot` - `.h .rerot`
@@ -592,7 +430,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
- To change the db nadeko will use, simply change the `db type` in `creds.yml` - To change the db nadeko will use, simply change the `db type` in `creds.yml`
- There is no migration code right now, which means that if you want to switch to another system you'll either have to manually export/import your database or start fresh - There is no migration code right now, which means that if you want to switch to another system you'll either have to manually export/import your database or start fresh
- Medusa system - Medusa system
- A massive new feature which allows developers to create custom modules/plugins/cogs - A massive new feature which allows developers to create custom modules/plugins/cogs
- They can be load/unloaded/updated at runtime without restarting the bot - They can be load/unloaded/updated at runtime without restarting the bot
### Changed ### Changed
@@ -628,7 +466,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
### Fixed ### Fixed
- Fixed the `id` which shows up when you add a new Expression - Fixed the `id` which shows up when you add a new Expression
- Fixed some strings which were still referring to "CustomReaction(s)" instead of "Expression(s)" - Fixed some strings which were still referring to "CustomReaction(s)" instead of "Expression(s)"
## [4.0.3] - 04.03.2022 ## [4.0.3] - 04.03.2022
@@ -654,20 +492,20 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
### Added ### Added
- Added `.deleteemptyservers` command - Added `.deleteemptyservers` command
- Added `.curtr <id>` which lets you see full information about one of your own transactions with the specified id - Added `.curtr <id>` which lets you see full information about one of your own transactions with the specified id
- Added trovo.live support for stream notifications (`.stadd`) - Added trovo.live support for stream notifications (`.stadd`)
- Added unclaimed waifu decay functionality - Added unclaimed waifu decay functionality
- Added 3 new settings to `data/gambling.yml` to control it: - Added 3 new settings to `data/gambling.yml` to control it:
- waifu.decay.percent - How much % to subtract from unclaimed waifu - waifu.decay.percent - How much % to subtract from unclaimed waifu
- waifu.decay.hourInterval - How often to decay the price - waifu.decay.hourInterval - How often to decay the price
- waifu.decay.minPrice - Unclaimed waifus with price lower than the one specified here will not be affected by the decay - waifu.decay.minPrice - Unclaimed waifus with price lower than the one specified here will not be affected by the decay
- Added `currency.transactionsLifetime` to `data/gambling.yml` Any transaction older than the number of days specified will be automatically deleted - Added `currency.transactionsLifetime` to `data/gambling.yml` Any transaction older than the number of days specified will be automatically deleted
- Added `.stock` command to check stock prices and charts - Added `.stock` command to check stock prices and charts
- Re-added `.qap / .queueautoplay` - Re-added `.qap / .queueautoplay`
### Changed ### Changed
- CustomReactions module (and customreactions db table) has been renamed to Expressions. - CustomReactions module (and customreactions db table) has been renamed to Expressions.
- This was done to remove confusion about how it relates to discord Reactions (it doesn't, it was created and named before discord reactions existed) - This was done to remove confusion about how it relates to discord Reactions (it doesn't, it was created and named before discord reactions existed)
- Expression command now start with ex/expr and end with the name of the action or setting. - Expression command now start with ex/expr and end with the name of the action or setting.
- For example `.exd` (`.dcr`) is expression delete, `.exa` (`.acr`) - For example `.exd` (`.dcr`) is expression delete, `.exa` (`.acr`)
- Permissions (`.lp`) be automatically updated with "ACTUALEXPRESSIONS", "EXPRESSIONS" instead of "ACTUALCUSTOMREACTIONS" and "CUSTOMREACTIONS" - Permissions (`.lp`) be automatically updated with "ACTUALEXPRESSIONS", "EXPRESSIONS" instead of "ACTUALCUSTOMREACTIONS" and "CUSTOMREACTIONS"
- Permissions for `.ecr` (now `.exe`), `.scr` (now `.exs`), `.dcr` (now `.exd`), `.acr` (now `.exa`), `.lcr` (now `.exl`) will be automatically updated - Permissions for `.ecr` (now `.exe`), `.scr` (now `.exs`), `.dcr` (now `.exd`), `.acr` (now `.exa`), `.lcr` (now `.exl`) will be automatically updated
@@ -684,8 +522,8 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
- [dev] Added Type, Extra, OtherId fields to the database - [dev] Added Type, Extra, OtherId fields to the database
- [dev] CommandStrings will now use methodname as the key, and **not** the command name (first entry in aliases.yml) - [dev] CommandStrings will now use methodname as the key, and **not** the command name (first entry in aliases.yml)
- In other words aliases.yml and commands.en-US.yml will use the same keys (once again) - In other words aliases.yml and commands.en-US.yml will use the same keys (once again)
- [dev] Reorganized module and submodule folders - [dev] Reorganized module and submodule folders
- [dev] Permissionv2 db table renamed to Permissions - [dev] Permissionv2 db table renamed to Permissions
- [dev] Moved FilterWordsChannelId to a separate table - [dev] Moved FilterWordsChannelId to a separate table
### Fixed ### Fixed
@@ -700,9 +538,9 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
- Fixed embed color when disabling `.antialt` - Fixed embed color when disabling `.antialt`
### Removed ### Removed
- Removed `.bce` - use `.config` or `.config bot` specifically for bot config - Removed `.bce` - use `.config` or `.config bot` specifically for bot config
- Removed obsolete placeholders: %users% %servers% %userfull% %username% %userdiscrim% %useravatar% %id% %uid% %chname% %cid% %sid% %members% %server_time% %shardid% %time% %mention% - Removed obsolete placeholders: %users% %servers% %userfull% %username% %userdiscrim% %useravatar% %id% %uid% %chname% %cid% %sid% %members% %server_time% %shardid% %time% %mention%
- Removed some obsolete commands and strings - Removed some obsolete commands and strings
- Removed code which migrated 2.x to v3 credentials, settings, etc... - Removed code which migrated 2.x to v3 credentials, settings, etc...
## [3.0.13] - 14.01.2022 ## [3.0.13] - 14.01.2022
@@ -741,7 +579,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
- Looks much nicer - Looks much nicer
- Bot will now reply to user messages with a translation if `del` is disabled - Bot will now reply to user messages with a translation if `del` is disabled
- Bot will make an embed with original and translated text with user avatar and name if `del` is enabled - Bot will make an embed with original and translated text with user avatar and name if `del` is enabled
- If the bot is unable to delete messages while having `del` enabled, it will reset back to the no-del behavior for the current session - If the bot is unable to delete messages while having `del` enabled, it will reset back to the no-del behavior for the current session
### Fixed ### Fixed
- `.crypto` now supports top 5000 coins - `.crypto` now supports top 5000 coins
@@ -755,7 +593,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
### Fixed ### Fixed
- `.xprewsreset` now has correct permissions - `.xprewsreset` now has correct permissions
### Removed ### Removed
- Removed slot.numbers from `images.yml` as they're no longer used - Removed slot.numbers from `images.yml` as they're no longer used
## [3.0.9] - 21.11.2021 ## [3.0.9] - 21.11.2021
@@ -765,7 +603,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
### Added ### Added
- Added `.emojiadd` with 3 overloads - Added `.emojiadd` with 3 overloads
- `.ea :customEmoji:` which copies another server's emoji - `.ea :customEmoji:` which copies another server's emoji
- `.ea newName :customEmoji:` which copies emoji under a different name - `.ea newName :customEmoji:` which copies emoji under a different name
- `.ea emojiName <imagelink.png>` which creates a new emoji from the specified image - `.ea emojiName <imagelink.png>` which creates a new emoji from the specified image
- Patreon Access and Refresh Tokens should now be automatically updated once a month as long as the user has provided the necessary credentials in creds.yml file: - Patreon Access and Refresh Tokens should now be automatically updated once a month as long as the user has provided the necessary credentials in creds.yml file:
@@ -779,7 +617,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
## [3.0.8] - 03.11.2021 ## [3.0.8] - 03.11.2021
### Added ### Added
- Created VotesApi project nad re-worked vote rewards handling - Created VotesApi project nad re-worked vote rewards handling
- Updated votes entries in creds.yml with explanations on how to set up vote links - Updated votes entries in creds.yml with explanations on how to set up vote links
@@ -804,10 +642,10 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
- They are called negative gifts - They are called negative gifts
- They show up at the end of the `.gifts` page and are marked with a broken heart - They show up at the end of the `.gifts` page and are marked with a broken heart
- They have a separate multiplier (`waifu.multi.negative_gift_effect` default 0.5, changeable via `.config gambling` or `data/gambling.yml`) - They have a separate multiplier (`waifu.multi.negative_gift_effect` default 0.5, changeable via `.config gambling` or `data/gambling.yml`)
- When gifted, the waifu's price will be reduced by the `price * multiplier` - When gifted, the waifu's price will be reduced by the `price * multiplier`
- Negative gifts don't show up in `.waifuinfo` nor is the record of them kept in the database - Negative gifts don't show up in `.waifuinfo` nor is the record of them kept in the database
### Fixed ### Fixed
- Fixed `%users%` and `%shard.usercount%` placeholders not showing correct values - Fixed `%users%` and `%shard.usercount%` placeholders not showing correct values
## [3.0.6] - 27.09.2021 ## [3.0.6] - 27.09.2021
@@ -848,7 +686,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
- Possible fix for `.repeat` bug - Possible fix for `.repeat` bug
- Slight adjustment for repeater logic - Slight adjustment for repeater logic
- Timer should no longer increase on some repeaters - Timer should no longer increase on some repeaters
- Repeaters should no longer have periods when they're missing from the list - Repeaters should no longer have periods when they're missing from the list
- Fixed several commands which used error color for success confirmation messages - Fixed several commands which used error color for success confirmation messages
## [3.0.3] - 15.09.2021 ## [3.0.3] - 15.09.2021
@@ -909,7 +747,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
- Explanations on how to get the keys are added as the comments - Explanations on how to get the keys are added as the comments
- Code cleanup - Code cleanup
- Command attributes cleaned up - Command attributes cleaned up
- Removed dummy Remarks and Usages attributes as hey were unused for a few patches but stayed in the code to avoid big git diffsmigration code has ran and it can be safely removed - Removed dummy Remarks and Usages attributes as hey were unused for a few patches but stayed in the code to avoid big git diffsmigration code has ran and it can be safely removed
- There are 2 projects: NadekoBot and NadekoBot.Coordinator - There are 2 projects: NadekoBot and NadekoBot.Coordinator
- You can directly run NadekoBot as the regular bot with one shard - You can directly run NadekoBot as the regular bot with one shard
- Run NadekoBot.Coordinator if you want more control over your shards and a grpc api for coordinator with which you can start, restart, kill and see status of shards - Run NadekoBot.Coordinator if you want more control over your shards and a grpc api for coordinator with which you can start, restart, kill and see status of shards
@@ -930,7 +768,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
## [2.46.2] - 14.07.2021 ## [2.46.2] - 14.07.2021
### Fixed ### Fixed
- Fixed .save for local songs - Fixed .save for local songs
- Fixed .lq for local songs if the song names are too long - Fixed .lq for local songs if the song names are too long
@@ -1001,7 +839,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
### Added ### Added
- Added `.crsexport` and `.crsimport` - Added `.crsexport` and `.crsimport`
- Allows for quick export/import of server or global custom reactions - Allows for quick export/import of server or global custom reactions
- Requires admin permissions for server crs, and owner for global crs - Requires admin permissions for server crs, and owner for global crs
- Explanation of the fields is in the comment at the top of the `.crsexport` .yml file - Explanation of the fields is in the comment at the top of the `.crsexport` .yml file
@@ -1034,7 +872,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
### Added ### Added
- Re-added `%music.playing%` and `%music.queued%` (#290) - Re-added `%music.playing%` and `%music.queued%` (#290)
- Added `%music.servers%` which shows how many servers have a song queued up to play - Added `%music.servers%` which shows how many servers have a song queued up to play
^ Only available to `.ropl` / `.adpl` feature atm ^ Only available to `.ropl` / `.adpl` feature atm
- `.autodc` re-added - `.autodc` re-added
- `.qrp`, `.vol`, `.smch` `.autodc` will now persist - `.qrp`, `.vol`, `.smch` `.autodc` will now persist
@@ -1054,7 +892,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
- Removing last song in the queue will no longer reset queue index - Removing last song in the queue will no longer reset queue index
- Having `.rpl` disabled will now correctly stop after the last song, closes #292 - Having `.rpl` disabled will now correctly stop after the last song, closes #292
### Removed ### Removed
- `.sad` removed. It's more or less useless. Use `.qrp` and `.autodc` now for similar effect - `.sad` removed. It's more or less useless. Use `.qrp` and `.autodc` now for similar effect
@@ -1069,7 +907,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
- Minor perf improvement for filter checks - Minor perf improvement for filter checks
### Fixed ### Fixed
- `.qs` result urls are now valid - `.qs` result urls are now valid
- Custom reactions with "`-`" as a response should once again disable that custom reaction completely - Custom reactions with "`-`" as a response should once again disable that custom reaction completely
@@ -1085,8 +923,8 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
- Much faster starting and skipping once the songs are in the queue - Much faster starting and skipping once the songs are in the queue
- Higher quality audio (no stuttering too!) - Higher quality audio (no stuttering too!)
- Local tracks will now have durations if you have ffprobe installed (comes with ffmpeg) - Local tracks will now have durations if you have ffprobe installed (comes with ffmpeg)
- Bot supports joining a different vc without skipping the song if you use `.j` - Bot supports joining a different vc without skipping the song if you use `.j`
- ⚠️ **DO NOT DRAG THE BOT** to another vc, as it's not properly supported atm, and you will have to do `.play` after dragging it) - ⚠️ **DO NOT DRAG THE BOT** to another vc, as it's not properly supported atm, and you will have to do `.play` after dragging it)
- `.j` makes the bot join your voice channel - `.j` makes the bot join your voice channel
- `.p` is now alias of play, pause is `.pause` - `.p` is now alias of play, pause is `.pause`
- `.qs` should work without google api key now for most users as it is using a custom loader - `.qs` should work without google api key now for most users as it is using a custom loader

View File

@@ -1,3 +1,8 @@
[![Discord](https://discordapp.com/api/guilds/117523346618318850/widget.png)](https://discord.gg/nadekobot)
[![Documentation Status](https://readthedocs.org/projects/nadekobot/badge/?version=latest)](http://nadekobot.readthedocs.io/en/v4/?badge=v4)
[![Discord Bots](https://discordbots.org/api/widget/status/116275390695079945.svg)](https://top.gg/bot/116275390695079945)
[![nadeko0](https://cdn.nadeko.bot/tutorial/docs-top.png)](https://nadeko.bot/) [![nadeko0](https://cdn.nadeko.bot/tutorial/docs-top.png)](https://nadeko.bot/)
[![nadeko1](https://cdn.nadeko.bot/tutorial/docs-mid.png)](https://invite.nadeko.bot/) [![nadeko1](https://cdn.nadeko.bot/tutorial/docs-mid.png)](https://invite.nadeko.bot/)

View File

@@ -33,17 +33,17 @@ These are required for a number of features to function properly, and all should
For a single owner, it should look like this: For a single owner, it should look like this:
```yml ```yml
OwnerIds: OwnerIds:
- 105635576866156544 - 105635576866156544
``` ```
For multiple owners, it should look like this: For multiple owners, it should look like this:
```yml ```yml
OwnerIds: OwnerIds:
- 105635123466156544 - 105635123466156544
- 145521851676884992 - 145521851676884992
- 341420590009417729 - 341420590009417729
``` ```

View File

@@ -1,4 +1,4 @@
w# Setting up NadekoBot on Linux # Setting up NadekoBot on Linux
| Table of Contents | | Table of Contents |
| :-------------------------------------------------- | | :-------------------------------------------------- |
@@ -15,14 +15,11 @@ w# Setting up NadekoBot on Linux
It is recommended that you use **Ubuntu 20.04**, as there have been nearly no problems with it. Also, **32-bit systems are incompatible**. It is recommended that you use **Ubuntu 20.04**, as there have been nearly no problems with it. Also, **32-bit systems are incompatible**.
### Ubuntu 22.04 is ruled as incompatible so double check which ubuntu version you are using.
##### Compatible operating systems: ##### Compatible operating systems:
- Ubuntu: 16.04, 18.04, 20.04, 21.04, 21.10 - Ubuntu: 16.04, 18.04, 20.04, 21.04, 21.10 22.04
- Mint: 19, 20 - Mint: 19, 20
- Debian: 10, 11 - Debian: 9, 10
- CentOS: 7 - CentOS: 7
- openSUSE - openSUSE
- Fedora: 33, 34, 35 - Fedora: 33, 34, 35
@@ -163,30 +160,15 @@ If you are presented with the installer main menu, exit it by choosing Option `8
The above command will create a new session named **nadeko** *(you can replace “nadeko” with anything you prefer, it's your session name)*. The above command will create a new session named **nadeko** *(you can replace “nadeko” with anything you prefer, it's your session name)*.
2. Run the installer: `bash linuxAIO.sh` 2. Navigate to the project's root directory
- Project root directory location example: `cd /home/user/nadekobot/`
3. There are a few options when it comes to running Nadeko. 3. Enter the `output` directory:
- `cd output`
- Run `3` to *Run the bot normally* 4. Run the bot using:
- Run `4` to *Run the bot with Auto Restart* (This is may or may not work) - `dotnet NadekoBot.dll`
5. Detatch the tmux session:
4. If option `4` was selected, you have the following options
```
1. Run Auto Restart normally without updating NadekoBot.
2. Run Auto Restart and update NadekoBot.
3. Exit
Choose:
[1] to Run NadekoBot with Auto Restart on "die" command without updating.
[2] to Run with Auto Updating on restart after using "die" command.
```
- Run `1` to update the bot upon restart. (This is done using the `.die` command)
- Run `2` to restart the bot without updating. (This is also done using the `.die` command)
5. That's it! to detatch the tmux session:
- Press `Ctrl` + `B` - Press `Ctrl` + `B`
- Then press `D` - Then press `D`
Now check your Discord server, the bot should be online. Nadeko should now be running in the background of your system. Now check your Discord server, the bot should be online. Nadeko should now be running in the background of your system.
To re-open the tmux session to either update, restart, or whatever, execute `tmux a -t nadeko`. *(Make sure to replace "nadeko" with your session name. If you didn't change it, leave it as it.)* To re-open the tmux session to either update, restart, or whatever, execute `tmux a -t nadeko`. *(Make sure to replace "nadeko" with your session name. If you didn't change it, leave it as it.)*
@@ -319,26 +301,6 @@ This method is similar to the one above, but requires one extra step, with the a
If you want Nadeko to play music for you 24/7 without having to hosting it on your PC and want to keep it cheap, reliable and convenient as possible, you can try Nadeko on Linux Digital Ocean Droplet using the link [DigitalOcean](http://m.do.co/c/46b4d3d44795/) (by using this link, you will get **$10 credit** and also support Nadeko) If you want Nadeko to play music for you 24/7 without having to hosting it on your PC and want to keep it cheap, reliable and convenient as possible, you can try Nadeko on Linux Digital Ocean Droplet using the link [DigitalOcean](http://m.do.co/c/46b4d3d44795/) (by using this link, you will get **$10 credit** and also support Nadeko)
To set up the VPS, please select the options below
```
These are the min requirements you must follow:
OS: Any between Ubuntu, Fedora, and Debian
Plan: Basic
CPU options: regular with SSD
1 GB / 1 CPU
25 GB SSD Disk
1000 GB transfer
Note: You can select the cheapest option with 512 MB /1 CPU but this has been a hit or miss.
Datacenter region: Choose one depending on where you are located.
Authentication: Password or SSH
(Select SSH if you know what you are doing, otherwise choose password)
```
**Setting up NadekoBot** **Setting up NadekoBot**
Assuming you have followed the link above to setup an account and a Droplet with a 64-bit operational system on Digital Ocean and got the `IP address and root password (in your e-mail)` to login, it's time to get started. Assuming you have followed the link above to setup an account and a Droplet with a 64-bit operational system on Digital Ocean and got the `IP address and root password (in your e-mail)` to login, it's time to get started.

View File

@@ -7,7 +7,7 @@ Open Terminal (if you don't know how to, click on the magnifying glass on the to
###### Homebrew/wget ###### Homebrew/wget
*Skip this step if you already have homebrew installed* *Skip this step if you already have homebrew installed*
- Copy and paste this command, then press Enter: - Copy and paste this command, then press Enter:
- `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"` - `/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"`
- Install wget - Install wget
- `brew install wget` - `brew install wget`

View File

@@ -147,7 +147,6 @@ This section will guide you through how to create a simple custom medusa. You ca
<!-- Use latest .net features --> <!-- Use latest .net features -->
<LangVersion>preview</LangVersion> <LangVersion>preview</LangVersion>
<EnablePreviewFeatures>true</EnablePreviewFeatures> <EnablePreviewFeatures>true</EnablePreviewFeatures>
<GenerateRequiresPreviewFeaturesAttribute>true</GenerateRequiresPreviewFeaturesAttribute>
<!-- tell .net that this library will be used as a plugin --> <!-- tell .net that this library will be used as a plugin -->
<EnableDynamicLoading>true</EnableDynamicLoading> <EnableDynamicLoading>true</EnableDynamicLoading>
@@ -156,7 +155,7 @@ This section will guide you through how to create a simple custom medusa. You ca
<ItemGroup> <ItemGroup>
<!-- Base medusa package. You MUST reference this in order to have a working medusa --> <!-- Base medusa package. You MUST reference this in order to have a working medusa -->
<!-- Also, this package comes from MyGet, which requires you to have a NuGet.Config file next to your .csproj --> <!-- Also, this package comes from MyGet, which requires you to have a NuGet.Config file next to your .csproj -->
<PackageReference Include="Nadeko.Medusa" Version="4.3.9"> <PackageReference Include="Nadeko.Medusa" Version="1.0.1">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
@@ -249,4 +248,4 @@ hello:
- Unload it - Unload it
- `.meunload example_medusa` - `.meunload example_medusa`
- Congrats! You've just made your first medusa! - Congrats! You've just made your first medusa!

View File

@@ -1,8 +1,5 @@
namespace Nadeko.Econ.Gambling; namespace Nadeko.Econ.Gambling;
//here is a payout chart
//https://lh6.googleusercontent.com/-i1hjAJy_kN4/UswKxmhrbPI/AAAAAAAAB1U/82wq_4ZZc-Y/DE6B0895-6FC1-48BE-AC4F-14D1B91AB75B.jpg
//thanks to judge for helping me with this
public class SlotGame public class SlotGame
{ {
private static readonly NadekoRandom _rng = new NadekoRandom(); private static readonly NadekoRandom _rng = new NadekoRandom();

View File

@@ -1,10 +0,0 @@
namespace Nadeko.Snake;
/// <summary>
/// Used as a marker class for bot_perm and user_perm Attributes
/// Has no functionality.
/// </summary>
public abstract class MedusaPermAttribute : Attribute
{
}

View File

@@ -1,7 +0,0 @@
namespace Nadeko.Snake;
[AttributeUsage(AttributeTargets.Method)]
public sealed class bot_owner_onlyAttribute : MedusaPermAttribute
{
}

View File

@@ -1,23 +0,0 @@
using Discord;
namespace Nadeko.Snake;
[AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
public sealed class bot_permAttribute : MedusaPermAttribute
{
public GuildPermission? GuildPerm { get; }
public ChannelPermission? ChannelPerm { get; }
public bot_permAttribute(GuildPermission perm)
{
GuildPerm = perm;
ChannelPerm = null;
}
public bot_permAttribute(ChannelPermission perm)
{
ChannelPerm = perm;
GuildPerm = null;
}
}

View File

@@ -1,22 +0,0 @@
using Discord;
namespace Nadeko.Snake;
[AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
public sealed class user_permAttribute : MedusaPermAttribute
{
public GuildPermission? GuildPerm { get; }
public ChannelPermission? ChannelPerm { get; }
public user_permAttribute(GuildPermission perm)
{
GuildPerm = perm;
ChannelPerm = null;
}
public user_permAttribute(ChannelPermission perm)
{
ChannelPerm = perm;
GuildPerm = null;
}
}

View File

@@ -22,11 +22,6 @@ public abstract class AnyContext
/// The user who invoked the command /// The user who invoked the command
/// </summary> /// </summary>
public abstract IUser User { get; } public abstract IUser User { get; }
/// <summary>
/// Bot user
/// </summary>
public abstract ISelfUser Bot { get; }
/// <summary> /// <summary>
/// Provides access to strings used by this medusa /// Provides access to strings used by this medusa

View File

@@ -10,7 +10,7 @@ public static class MedusaExtensions
embed: embed.Build(), embed: embed.Build(),
options: new() options: new()
{ {
RetryMode = RetryMode.Retry502 RetryMode = RetryMode.AlwaysRetry
}); });
// unlocalized // unlocalized

View File

@@ -10,7 +10,6 @@ public interface IEmbedBuilder
IEmbedBuilder WithFooter(string text, string? iconUrl = null); IEmbedBuilder WithFooter(string text, string? iconUrl = null);
IEmbedBuilder WithAuthor(string name, string? iconUrl = null, string? url = null); IEmbedBuilder WithAuthor(string name, string? iconUrl = null, string? url = null);
IEmbedBuilder WithColor(EmbedColor color); IEmbedBuilder WithColor(EmbedColor color);
IEmbedBuilder WithDiscordColor(Color color);
Embed Build(); Embed Build();
IEmbedBuilder WithUrl(string url); IEmbedBuilder WithUrl(string url);
IEmbedBuilder WithImageUrl(string url); IEmbedBuilder WithImageUrl(string url);

View File

@@ -12,12 +12,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Discord.Net.Core" Version="3.104.0" /> <PackageReference Include="Discord.Net.Core" Version="3.103.0" />
<PackageReference Include="Serilog" Version="2.11.0" /> <PackageReference Include="Serilog" Version="2.11.0" />
<PackageReference Include="YamlDotNet" Version="11.2.1" /> <PackageReference Include="YamlDotNet" Version="11.2.1" />
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(Version)' == '' ">
<Version>5.0.0</Version>
</PropertyGroup>
</Project> </Project>

View File

@@ -3,12 +3,14 @@ using Microsoft.Extensions.DependencyInjection;
using NadekoBot.Common.Configs; using NadekoBot.Common.Configs;
using NadekoBot.Common.ModuleBehaviors; using NadekoBot.Common.ModuleBehaviors;
using NadekoBot.Db; using NadekoBot.Db;
using NadekoBot.Modules.Administration;
using NadekoBot.Modules.Utility; using NadekoBot.Modules.Utility;
using NadekoBot.Services.Database.Models; using NadekoBot.Services.Database.Models;
using System.Collections.Immutable; using System.Collections.Immutable;
using System.Diagnostics; using System.Diagnostics;
using System.Net; using System.Net;
using System.Reflection; using System.Reflection;
using Nadeko.Common;
using RunMode = Discord.Commands.RunMode; using RunMode = Discord.Commands.RunMode;
namespace NadekoBot; namespace NadekoBot;
@@ -69,7 +71,7 @@ public sealed class Bot
: GatewayIntents.AllUnprivileged, : GatewayIntents.AllUnprivileged,
LogGatewayIntentWarnings = false, LogGatewayIntentWarnings = false,
FormatUsersInBidirectionalUnicode = false, FormatUsersInBidirectionalUnicode = false,
DefaultRetryMode = RetryMode.Retry502 DefaultRetryMode = RetryMode.AlwaysRetry ^ RetryMode.RetryRatelimit
}); });
_commandService = new(new() _commandService = new(new()
@@ -116,6 +118,10 @@ public sealed class Bot
// cache // cache
.AddCache(_creds); .AddCache(_creds);
// admin
#if GLOBAL_NADEKO
svcs.AddSingleton<ILogCommandService, DummyLogCommandService>();
#endif
svcs.AddHttpClient(); svcs.AddHttpClient();
svcs.AddHttpClient("memelist") svcs.AddHttpClient("memelist")
@@ -313,29 +319,10 @@ public sealed class Bot
await _commandService.AddModulesAsync(typeof(Bot).Assembly, Services); await _commandService.AddModulesAsync(typeof(Bot).Assembly, Services);
// await _interactionService.AddModulesAsync(typeof(Bot).Assembly, Services); // await _interactionService.AddModulesAsync(typeof(Bot).Assembly, Services);
IsReady = true; IsReady = true;
await EnsureBotOwnershipAsync();
_ = Task.Run(ExecuteReadySubscriptions); _ = Task.Run(ExecuteReadySubscriptions);
Log.Information("Shard {ShardId} ready", Client.ShardId); Log.Information("Shard {ShardId} ready", Client.ShardId);
} }
private async ValueTask EnsureBotOwnershipAsync()
{
try
{
if (_creds.OwnerIds.Count != 0)
return;
Log.Information("Initializing Owner Id...");
var info = await Client.GetApplicationInfoAsync();
_credsProvider.ModifyCredsFile(x => x.OwnerIds = new[] { info.Owner.Id });
}
catch (Exception ex)
{
Log.Warning("Getting application info failed: {ErrorMessage}", ex.Message);
}
}
private Task ExecuteReadySubscriptions() private Task ExecuteReadySubscriptions()
{ {
var readyExecutors = Services.GetServices<IReadyExecutor>(); var readyExecutors = Services.GetServices<IReadyExecutor>();

View File

@@ -3,7 +3,7 @@ using NadekoBot.Modules.Administration.Services;
namespace Discord; namespace Discord;
[AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] [AttributeUsage(AttributeTargets.Method)]
public class UserPermAttribute : RequireUserPermissionAttribute public class UserPermAttribute : RequireUserPermissionAttribute
{ {
public UserPermAttribute(GuildPerm permission) public UserPermAttribute(GuildPerm permission)

View File

@@ -12,7 +12,7 @@ namespace NadekoBot.Common.Configs;
public sealed partial class BotConfig : ICloneable<BotConfig> public sealed partial class BotConfig : ICloneable<BotConfig>
{ {
[Comment(@"DO NOT CHANGE")] [Comment(@"DO NOT CHANGE")]
public int Version { get; set; } = 5; public int Version { get; set; } = 4;
[Comment(@"Most commands, when executed, have a small colored line [Comment(@"Most commands, when executed, have a small colored line
next to the response. The color depends whether the command next to the response. The color depends whether the command
@@ -39,10 +39,6 @@ Allowed values: Simple, Normal, None")]
@"Do you want the message to be forwarded only to the first owner specified in the list of owners (in creds.yml), @"Do you want the message to be forwarded only to the first owner specified in the list of owners (in creds.yml),
or all owners? (this might cause the bot to lag if there's a lot of owners specified)")] or all owners? (this might cause the bot to lag if there's a lot of owners specified)")]
public bool ForwardToAllOwners { get; set; } public bool ForwardToAllOwners { get; set; }
[Comment(@"Any messages sent by users in Bot's DM to be forwarded to the specified channel.
This option will only work when ForwardToAllOwners is set to false")]
public ulong? ForwardToChannel { get; set; }
[Comment(@"When a user DMs the bot with a message which is not a command [Comment(@"When a user DMs the bot with a message which is not a command
they will receive this message. Leave empty for no response. The string which will be sent whenever someone DMs the bot. they will receive this message. Leave empty for no response. The string which will be sent whenever someone DMs the bot.

View File

@@ -29,7 +29,4 @@ public enum LogType
VoicePresenceTts, VoicePresenceTts,
UserMuted, UserMuted,
UserWarned, UserWarned,
ThreadDeleted,
ThreadCreated
} }

View File

@@ -1,8 +0,0 @@
namespace NadekoBot;
public interface INadekoInteractionService
{
public NadekoInteraction Create<T>(
ulong userId,
SimpleInteraction<T> inter);
}

View File

@@ -0,0 +1,29 @@
namespace NadekoBot;
public sealed class NadekoButtonActionInteraction : NadekoButtonOwnInteraction
{
private readonly NadekoInteractionData _data;
private readonly Func<SocketMessageComponent, Task> _action;
public NadekoButtonActionInteraction(
DiscordSocketClient client,
ulong authorId,
NadekoInteractionData data,
Func<SocketMessageComponent, Task> action
)
: base(client, authorId)
{
_data = data;
_action = action;
}
protected override string Name
=> _data.CustomId;
protected override IEmote Emote
=> _data.Emote;
protected override string? Text
=> _data.Text;
public override Task ExecuteOnActionAsync(SocketMessageComponent smc)
=> _action(smc);
}

View File

@@ -1,30 +1,25 @@
namespace NadekoBot; namespace NadekoBot;
public sealed class NadekoInteraction public abstract class NadekoButtonInteraction
{ {
private readonly ulong _authorId; // improvements:
private readonly ButtonBuilder _button; // - state in OnAction
private readonly Func<SocketMessageComponent, Task> _onClick; // - configurable delay
private readonly bool _onlyAuthor; // -
protected abstract string Name { get; }
protected abstract IEmote Emote { get; }
protected virtual string? Text { get; } = null;
public DiscordSocketClient Client { get; } public DiscordSocketClient Client { get; }
private readonly TaskCompletionSource<bool> _interactionCompletedSource; protected readonly TaskCompletionSource<bool> _interactionCompletedSource;
private IUserMessage message = null!; protected IUserMessage message = null!;
public NadekoInteraction(DiscordSocketClient client, protected NadekoButtonInteraction(DiscordSocketClient client)
ulong authorId,
ButtonBuilder button,
Func<SocketMessageComponent, Task> onClick,
bool onlyAuthor)
{ {
_authorId = authorId;
_button = button;
_onClick = onClick;
_onlyAuthor = onlyAuthor;
_interactionCompletedSource = new(TaskCreationOptions.RunContinuationsAsynchronously);
Client = client; Client = client;
_interactionCompletedSource = new(TaskCreationOptions.RunContinuationsAsynchronously);
} }
public async Task RunAsync(IUserMessage msg) public async Task RunAsync(IUserMessage msg)
@@ -32,25 +27,29 @@ public sealed class NadekoInteraction
message = msg; message = msg;
Client.InteractionCreated += OnInteraction; Client.InteractionCreated += OnInteraction;
await Task.WhenAny(Task.Delay(15_000), _interactionCompletedSource.Task); await Task.WhenAny(Task.Delay(10_000), _interactionCompletedSource.Task);
Client.InteractionCreated -= OnInteraction; Client.InteractionCreated -= OnInteraction;
await msg.ModifyAsync(m => m.Components = new ComponentBuilder().Build()); await msg.ModifyAsync(m => m.Components = new ComponentBuilder().Build());
} }
private Task OnInteraction(SocketInteraction arg) protected abstract ValueTask<bool> Validate(SocketMessageComponent smc);
private async Task OnInteraction(SocketInteraction arg)
{ {
if (arg is not SocketMessageComponent smc) if (arg is not SocketMessageComponent smc)
return Task.CompletedTask; return;
if (smc.Message.Id != message.Id) if (smc.Message.Id != message.Id)
return Task.CompletedTask; return;
if (_onlyAuthor && smc.User.Id != _authorId) if (smc.Data.CustomId != Name)
return Task.CompletedTask; return;
if (smc.Data.CustomId != _button.CustomId) if (!await Validate(smc))
return Task.CompletedTask; {
await smc.DeferAsync();
return;
}
_ = Task.Run(async () => _ = Task.Run(async () =>
{ {
@@ -64,19 +63,21 @@ public sealed class NadekoInteraction
await smc.DeferAsync(); await smc.DeferAsync();
} }
}); });
return Task.CompletedTask;
} }
public MessageComponent CreateComponent() public virtual MessageComponent CreateComponent()
{ {
var comp = new ComponentBuilder() var comp = new ComponentBuilder()
.WithButton(_button); .WithButton(GetButtonBuilder());
return comp.Build(); return comp.Build();
} }
public Task ExecuteOnActionAsync(SocketMessageComponent smc) public ButtonBuilder GetButtonBuilder()
=> _onClick(smc); => new ButtonBuilder(style: ButtonStyle.Secondary, emote: Emote, customId: Name, label: Text);
}
public abstract Task ExecuteOnActionAsync(SocketMessageComponent smc);
}
// this is all so wrong ...

View File

@@ -0,0 +1,43 @@
// namespace NadekoBot;
//
// public class NadekoButtonInteractionArray : NadekoButtonInteraction
// {
// private readonly ButtonBuilder[] _bbs;
// private readonly NadekoButtonInteraction[] _inters;
//
// public NadekoButtonInteractionArray(params NadekoButtonInteraction[] inters)
// : base(inters[0].Client)
// {
// _inters = inters;
// _bbs = inters.Map(x => x.GetButtonBuilder());
// }
//
// protected override string Name
// => throw new NotSupportedException();
// protected override IEmote Emote
// => throw new NotSupportedException();
//
// protected override ValueTask<bool> Validate(SocketMessageComponent smc)
// => new(true);
//
// public override Task ExecuteOnActionAsync(SocketMessageComponent smc)
// {
// for (var i = 0; i < _bbs.Length; i++)
// {
// if (_bbs[i].CustomId == smc.Data.CustomId)
// return _inters[i].ExecuteOnActionAsync(smc);
// }
//
// return Task.CompletedTask;
// }
//
// public override MessageComponent CreateComponent()
// {
// var comp = new ComponentBuilder();
//
// foreach (var bb in _bbs)
// comp.WithButton(bb);
//
// return comp.Build();
// }
// }

View File

@@ -0,0 +1,42 @@
namespace NadekoBot;
/// <summary>
/// Builder class for NadekoInteractions
/// </summary>
public class NadekoInteractionBuilder
{
private NadekoInteractionData? iData;
private Func<SocketMessageComponent, Task>? action;
// private bool isOwn;
public NadekoInteractionBuilder WithData<T>(in T data)
where T : NadekoInteractionData
{
iData = data;
return this;
}
// public NadekoOwnInteractionBuiler WithIsOwn(bool isOwn = true)
// {
// this.isOwn = isOwn;
// return this;
// }
public NadekoInteractionBuilder WithAction(in Func<SocketMessageComponent, Task> fn)
{
this.action = fn;
return this;
}
public NadekoButtonActionInteraction Build(DiscordSocketClient client, ulong userId)
{
if (iData is null)
throw new InvalidOperationException("You have to specify the data before building the interaction");
if (action is null)
throw new InvalidOperationException("You have to specify the action before building the interaction");
return new(client, userId, iData, action);
}
}

View File

@@ -1,20 +0,0 @@
namespace NadekoBot;
public class NadekoInteractionService : INadekoInteractionService, INService
{
private readonly DiscordSocketClient _client;
public NadekoInteractionService(DiscordSocketClient client)
{
_client = client;
}
public NadekoInteraction Create<T>(
ulong userId,
SimpleInteraction<T> inter)
=> new NadekoInteraction(_client,
userId,
inter.Button,
inter.TriggerAsync,
onlyAuthor: true);
}

View File

@@ -0,0 +1,15 @@
namespace NadekoBot;
/// <summary>
/// Interaction which only the author can use
/// </summary>
public abstract class NadekoButtonOwnInteraction : NadekoButtonInteraction
{
protected readonly ulong _authorId;
protected NadekoButtonOwnInteraction(DiscordSocketClient client, ulong authorId) : base(client)
=> _authorId = authorId;
protected override ValueTask<bool> Validate(SocketMessageComponent smc)
=> new(smc.User.Id == _authorId);
}

View File

@@ -5,11 +5,9 @@ public sealed class DmContextAdapter : DmContext
public override IMedusaStrings Strings { get; } public override IMedusaStrings Strings { get; }
public override IDMChannel Channel { get; } public override IDMChannel Channel { get; }
public override IUserMessage Message { get; } public override IUserMessage Message { get; }
public override ISelfUser Bot { get; }
public override IUser User public override IUser User
=> Message.Author; => Message.Author;
private readonly IServiceProvider _services; private readonly IServiceProvider _services;
private readonly Lazy<IEmbedBuilderService> _ebs; private readonly Lazy<IEmbedBuilderService> _ebs;
private readonly Lazy<IBotStrings> _botStrings; private readonly Lazy<IBotStrings> _botStrings;
@@ -28,7 +26,6 @@ public sealed class DmContextAdapter : DmContext
Channel = ch; Channel = ch;
Message = ctx.Message; Message = ctx.Message;
Bot = ctx.Client.CurrentUser;
_ebs = new(_services.GetRequiredService<IEmbedBuilderService>()); _ebs = new(_services.GetRequiredService<IEmbedBuilderService>());

View File

@@ -1,31 +0,0 @@
namespace Nadeko.Medusa.Adapters;
public class FilterAdapter : PreconditionAttribute
{
private readonly FilterAttribute _filterAttribute;
private readonly IMedusaStrings _strings;
public FilterAdapter(FilterAttribute filterAttribute,
IMedusaStrings strings)
{
_filterAttribute = filterAttribute;
_strings = strings;
}
public override async Task<PreconditionResult> CheckPermissionsAsync(
ICommandContext context,
CommandInfo command,
IServiceProvider services)
{
var medusaContext = ContextAdapterFactory.CreateNew(context,
_strings,
services);
var result = await _filterAttribute.CheckAsync(medusaContext);
if (!result)
return PreconditionResult.FromError($"Precondition '{_filterAttribute.GetType().Name}' failed.");
return PreconditionResult.FromSuccess();
}
}

View File

@@ -11,7 +11,6 @@ public sealed class GuildContextAdapter : GuildContext
public override IMedusaStrings Strings { get; } public override IMedusaStrings Strings { get; }
public override IGuild Guild { get; } public override IGuild Guild { get; }
public override ITextChannel Channel { get; } public override ITextChannel Channel { get; }
public override ISelfUser Bot { get; }
public override IUserMessage Message public override IUserMessage Message
=> _ctx.Message; => _ctx.Message;
@@ -29,7 +28,6 @@ public sealed class GuildContextAdapter : GuildContext
Strings = strings; Strings = strings;
User = (IGuildUser)ctx.User; User = (IGuildUser)ctx.User;
Bot = ctx.Client.CurrentUser;
_services = services; _services = services;
_ebs = new(_services.GetRequiredService<IEmbedBuilderService>()); _ebs = new(_services.GetRequiredService<IEmbedBuilderService>());

View File

@@ -22,6 +22,8 @@ public sealed class MedusaConfigService : ConfigServiceBase<MedusaConfig>, IMedu
public void AddLoadedMedusa(string name) public void AddLoadedMedusa(string name)
{ {
name = name.Trim().ToLowerInvariant();
ModifyConfig(conf => ModifyConfig(conf =>
{ {
if (conf.Loaded is null) if (conf.Loaded is null)
@@ -34,6 +36,8 @@ public sealed class MedusaConfigService : ConfigServiceBase<MedusaConfig>, IMedu
public void RemoveLoadedMedusa(string name) public void RemoveLoadedMedusa(string name)
{ {
name = name.Trim().ToLowerInvariant();
ModifyConfig(conf => ModifyConfig(conf =>
{ {
if (conf.Loaded is null) if (conf.Loaded is null)

View File

@@ -1,6 +1,5 @@
using Discord.Commands.Builders; using Discord.Commands.Builders;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Nadeko.Medusa.Adapters;
using NadekoBot.Common.ModuleBehaviors; using NadekoBot.Common.ModuleBehaviors;
using System.Collections.Immutable; using System.Collections.Immutable;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
@@ -187,6 +186,7 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
return MedusaLoadResult.AlreadyLoaded; return MedusaLoadResult.AlreadyLoaded;
var safeName = Uri.EscapeDataString(name); var safeName = Uri.EscapeDataString(name);
name = name.ToLowerInvariant();
await _lock.WaitAsync(); await _lock.WaitAsync();
try try
@@ -383,11 +383,6 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
{ {
var m = mb.WithName(snekInfo.Name); var m = mb.WithName(snekInfo.Name);
foreach (var f in snekInfo.Filters)
{
m.AddPrecondition(new FilterAdapter(f, strings));
}
foreach (var cmd in snekInfo.Commands) foreach (var cmd in snekInfo.Commands)
{ {
m.AddCommand(cmd.Aliases.First(), m.AddCommand(cmd.Aliases.First(),
@@ -396,7 +391,7 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
new(cmd), new(cmd),
new(medusaServices), new(medusaServices),
strings), strings),
CreateCommandFactory(medusaName, cmd, strings)); CreateCommandFactory(medusaName, cmd));
} }
foreach (var subInfo in snekInfo.Subsneks) foreach (var subInfo in snekInfo.Subsneks)
@@ -405,7 +400,7 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
private static readonly RequireContextAttribute _reqGuild = new RequireContextAttribute(ContextType.Guild); private static readonly RequireContextAttribute _reqGuild = new RequireContextAttribute(ContextType.Guild);
private static readonly RequireContextAttribute _reqDm = new RequireContextAttribute(ContextType.DM); private static readonly RequireContextAttribute _reqDm = new RequireContextAttribute(ContextType.DM);
private Action<CommandBuilder> CreateCommandFactory(string medusaName, SnekCommandData cmd, IMedusaStrings strings) private Action<CommandBuilder> CreateCommandFactory(string medusaName, SnekCommandData cmd)
=> (cb) => => (cb) =>
{ {
cb.AddAliases(cmd.Aliases.Skip(1).ToArray()); cb.AddAliases(cmd.Aliases.Skip(1).ToArray());
@@ -414,31 +409,6 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
cb.AddPrecondition(_reqGuild); cb.AddPrecondition(_reqGuild);
else if (cmd.ContextType == CommandContextType.Dm) else if (cmd.ContextType == CommandContextType.Dm)
cb.AddPrecondition(_reqDm); cb.AddPrecondition(_reqDm);
foreach (var f in cmd.Filters)
cb.AddPrecondition(new FilterAdapter(f, strings));
foreach (var ubp in cmd.UserAndBotPerms)
{
if (ubp is user_permAttribute up)
{
if (up.GuildPerm is { } gp)
cb.AddPrecondition(new UserPermAttribute(gp));
else if (up.ChannelPerm is { } cp)
cb.AddPrecondition(new UserPermAttribute(cp));
}
else if (ubp is bot_permAttribute bp)
{
if (bp.GuildPerm is { } gp)
cb.AddPrecondition(new BotPermAttribute(gp));
else if (bp.ChannelPerm is { } cp)
cb.AddPrecondition(new BotPermAttribute(cp));
}
else if (ubp is bot_owner_onlyAttribute)
{
cb.AddPrecondition(new OwnerOnlyAttribute());
}
}
cb.WithPriority(cmd.Priority); cb.WithPriority(cmd.Priority);
@@ -555,6 +525,7 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
[MethodImpl(MethodImplOptions.NoInlining)] [MethodImpl(MethodImplOptions.NoInlining)]
private async Task<MedusaUnloadResult> InternalUnloadAsync(string name) private async Task<MedusaUnloadResult> InternalUnloadAsync(string name)
{ {
name = name.ToLowerInvariant();
if (!_resolved.Remove(name, out var lsi)) if (!_resolved.Remove(name, out var lsi))
return MedusaUnloadResult.NotLoaded; return MedusaUnloadResult.NotLoaded;
@@ -781,10 +752,8 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
var cmds = new List<SnekCommandData>(); var cmds = new List<SnekCommandData>();
foreach (var method in methodInfos) foreach (var method in methodInfos)
{ {
var filters = method.GetCustomAttributes<FilterAttribute>(true).ToArray(); var filters = method.GetCustomAttributes<FilterAttribute>().ToArray();
var userAndBotPerms = method.GetCustomAttributes<MedusaPermAttribute>(true) var prio = method.GetCustomAttribute<prioAttribute>()?.Priority ?? 0;
.ToArray();
var prio = method.GetCustomAttribute<prioAttribute>(true)?.Priority ?? 0;
var paramInfos = method.GetParameters(); var paramInfos = method.GetParameters();
var cmdParams = new List<ParamData>(); var cmdParams = new List<ParamData>();
@@ -861,7 +830,7 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
} }
var cmdAttribute = method.GetCustomAttribute<cmdAttribute>(true)!; var cmdAttribute = method.GetCustomAttribute<cmdAttribute>()!;
var aliases = cmdAttribute.Aliases; var aliases = cmdAttribute.Aliases;
if (aliases.Length == 0) if (aliases.Length == 0)
aliases = new[] { method.Name.ToLowerInvariant() }; aliases = new[] { method.Name.ToLowerInvariant() };
@@ -871,7 +840,6 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
method, method,
instance, instance,
filters, filters,
userAndBotPerms,
cmdContext, cmdContext,
diParams, diParams,
cmdParams, cmdParams,

View File

@@ -11,7 +11,6 @@ public sealed class SnekCommandData
MethodInfo methodInfo, MethodInfo methodInfo,
Snek module, Snek module,
FilterAttribute[] filters, FilterAttribute[] filters,
MedusaPermAttribute[] userAndBotPerms,
CommandContextType contextType, CommandContextType contextType,
IReadOnlyList<Type> injectedParams, IReadOnlyList<Type> injectedParams,
IReadOnlyList<ParamData> parameters, IReadOnlyList<ParamData> parameters,
@@ -22,7 +21,6 @@ public sealed class SnekCommandData
MethodInfo = methodInfo; MethodInfo = methodInfo;
Module = module; Module = module;
Filters = filters; Filters = filters;
UserAndBotPerms = userAndBotPerms;
ContextType = contextType; ContextType = contextType;
InjectedParams = injectedParams; InjectedParams = injectedParams;
Parameters = parameters; Parameters = parameters;
@@ -30,8 +28,6 @@ public sealed class SnekCommandData
OptionalStrings = strings; OptionalStrings = strings;
} }
public MedusaPermAttribute[] UserAndBotPerms { get; set; }
public CommandStrings OptionalStrings { get; set; } public CommandStrings OptionalStrings { get; set; }
public IReadOnlyCollection<string> Aliases { get; } public IReadOnlyCollection<string> Aliases { get; }

View File

@@ -0,0 +1,26 @@
namespace NadekoBot.Common;
public abstract class NInteraction
{
private readonly DiscordSocketClient _client;
private readonly ulong _userId;
private readonly Func<SocketMessageComponent, Task> _action;
protected abstract NadekoInteractionData Data { get; }
public NInteraction(
DiscordSocketClient client,
ulong userId,
Func<SocketMessageComponent, Task> action)
{
_client = client;
_userId = userId;
_action = action;
}
public NadekoButtonInteraction GetInteraction()
=> new NadekoInteractionBuilder()
.WithData(Data)
.WithAction(_action)
.Build(_client, _userId);
}

View File

@@ -18,7 +18,6 @@ public abstract class NadekoModule : ModuleBase
public CommandHandler _cmdHandler { get; set; } public CommandHandler _cmdHandler { get; set; }
public ILocalization _localization { get; set; } public ILocalization _localization { get; set; }
public IEmbedBuilderService _eb { get; set; } public IEmbedBuilderService _eb { get; set; }
public INadekoInteractionService _inter { get; set; }
protected string prefix protected string prefix
=> _cmdHandler.GetPrefix(ctx.Guild); => _cmdHandler.GetPrefix(ctx.Guild);
@@ -37,7 +36,7 @@ public abstract class NadekoModule : ModuleBase
string error, string error,
string url = null, string url = null,
string footer = null, string footer = null,
NadekoInteraction inter = null) NadekoButtonInteraction inter = null)
=> ctx.Channel.SendErrorAsync(_eb, title, error, url, footer); => ctx.Channel.SendErrorAsync(_eb, title, error, url, footer);
public Task<IUserMessage> SendConfirmAsync( public Task<IUserMessage> SendConfirmAsync(
@@ -48,32 +47,32 @@ public abstract class NadekoModule : ModuleBase
=> ctx.Channel.SendConfirmAsync(_eb, title, text, url, footer); => ctx.Channel.SendConfirmAsync(_eb, title, text, url, footer);
// //
public Task<IUserMessage> SendErrorAsync(string text, NadekoInteraction inter = null) public Task<IUserMessage> SendErrorAsync(string text, NadekoButtonInteraction inter = null)
=> ctx.Channel.SendAsync(_eb, text, MessageType.Error, inter); => ctx.Channel.SendAsync(_eb, text, MessageType.Error, inter);
public Task<IUserMessage> SendConfirmAsync(string text, NadekoInteraction inter = null) public Task<IUserMessage> SendConfirmAsync(string text, NadekoButtonInteraction inter = null)
=> ctx.Channel.SendAsync(_eb, text, MessageType.Ok, inter); => ctx.Channel.SendAsync(_eb, text, MessageType.Ok, inter);
public Task<IUserMessage> SendPendingAsync(string text, NadekoInteraction inter = null) public Task<IUserMessage> SendPendingAsync(string text, NadekoButtonInteraction inter = null)
=> ctx.Channel.SendAsync(_eb, text, MessageType.Pending, inter); => ctx.Channel.SendAsync(_eb, text, MessageType.Pending, inter);
// localized normal // localized normal
public Task<IUserMessage> ErrorLocalizedAsync(LocStr str, NadekoInteraction inter = null) public Task<IUserMessage> ErrorLocalizedAsync(LocStr str, NadekoButtonInteraction inter = null)
=> SendErrorAsync(GetText(str), inter); => SendErrorAsync(GetText(str), inter);
public Task<IUserMessage> PendingLocalizedAsync(LocStr str, NadekoInteraction inter = null) public Task<IUserMessage> PendingLocalizedAsync(LocStr str, NadekoButtonInteraction inter = null)
=> SendPendingAsync(GetText(str), inter); => SendPendingAsync(GetText(str), inter);
public Task<IUserMessage> ConfirmLocalizedAsync(LocStr str, NadekoInteraction inter = null) public Task<IUserMessage> ConfirmLocalizedAsync(LocStr str, NadekoButtonInteraction inter = null)
=> SendConfirmAsync(GetText(str), inter); => SendConfirmAsync(GetText(str), inter);
// localized replies // localized replies
public Task<IUserMessage> ReplyErrorLocalizedAsync(LocStr str, NadekoInteraction inter = null) public Task<IUserMessage> ReplyErrorLocalizedAsync(LocStr str, NadekoButtonInteraction inter = null)
=> SendErrorAsync($"{Format.Bold(ctx.User.ToString())} {GetText(str)}", inter); => SendErrorAsync($"{Format.Bold(ctx.User.ToString())} {GetText(str)}", inter);
public Task<IUserMessage> ReplyPendingLocalizedAsync(LocStr str, NadekoInteraction inter = null) public Task<IUserMessage> ReplyPendingLocalizedAsync(LocStr str, NadekoButtonInteraction inter = null)
=> SendPendingAsync($"{Format.Bold(ctx.User.ToString())} {GetText(str)}", inter); => SendPendingAsync($"{Format.Bold(ctx.User.ToString())} {GetText(str)}", inter);
public Task<IUserMessage> ReplyConfirmLocalizedAsync(LocStr str, NadekoInteraction inter = null) public Task<IUserMessage> ReplyConfirmLocalizedAsync(LocStr str, NadekoButtonInteraction inter = null)
=> SendConfirmAsync($"{Format.Bold(ctx.User.ToString())} {GetText(str)}", inter); => SendConfirmAsync($"{Format.Bold(ctx.User.ToString())} {GetText(str)}", inter);
public async Task<bool> PromptUserConfirmAsync(IEmbedBuilder embed) public async Task<bool> PromptUserConfirmAsync(IEmbedBuilder embed)

View File

@@ -1,14 +1,15 @@
using CommandLine; #nullable disable
using CommandLine;
namespace NadekoBot.Common; namespace NadekoBot.Common;
public static class OptionsParser public static class OptionsParser
{ {
public static T ParseFrom<T>(string[]? args) public static T ParseFrom<T>(string[] args)
where T : INadekoCommandOptions, new() where T : INadekoCommandOptions, new()
=> ParseFrom(new T(), args).Item1; => ParseFrom(new T(), args).Item1;
public static (T, bool) ParseFrom<T>(T options, string[]? args) public static (T, bool) ParseFrom<T>(T options, string[] args)
where T : INadekoCommandOptions where T : INadekoCommandOptions
{ {
using var p = new Parser(x => using var p = new Parser(x =>

View File

@@ -1,33 +0,0 @@
namespace NadekoBot.Common.TypeReaders;
public sealed class GuildUserTypeReader : NadekoTypeReader<IGuildUser>
{
public override async ValueTask<TypeReaderResult<IGuildUser>> ReadAsync(ICommandContext ctx, string input)
{
if (ctx.Guild is null)
return TypeReaderResult.FromError<IGuildUser>(CommandError.Unsuccessful, "Must be in a guild.");
input = input.Trim();
IGuildUser? user = null;
if (MentionUtils.TryParseUser(input, out var id))
user = await ctx.Guild.GetUserAsync(id, CacheMode.AllowDownload);
if (ulong.TryParse(input, out id))
user = await ctx.Guild.GetUserAsync(id, CacheMode.AllowDownload);
if (user is null)
{
var users = await ctx.Guild.GetUsersAsync(CacheMode.CacheOnly);
user = users.FirstOrDefault(x => x.Username == input)
?? users.FirstOrDefault(x =>
string.Equals(x.ToString(), input, StringComparison.InvariantCultureIgnoreCase))
?? users.FirstOrDefault(x =>
string.Equals(x.Username, input, StringComparison.InvariantCultureIgnoreCase));
}
if (user is null)
return TypeReaderResult.FromError<IGuildUser>(CommandError.ObjectNotFound, "User not found.");
return TypeReaderResult.FromSuccess(user);
}
}

View File

@@ -1,5 +1,4 @@
#nullable disable #nullable disable
using LinqToDB.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using NadekoBot.Services.Database.Models; using NadekoBot.Services.Database.Models;
@@ -7,14 +6,12 @@ namespace NadekoBot.Db;
public static class CurrencyTransactionExtensions public static class CurrencyTransactionExtensions
{ {
public static Task<List<CurrencyTransaction>> GetPageFor( public static List<CurrencyTransaction> GetPageFor(this DbSet<CurrencyTransaction> set, ulong userId, int page)
this DbSet<CurrencyTransaction> set, => set.AsQueryable()
ulong userId, .AsNoTracking()
int page) .Where(x => x.UserId == userId)
=> set.ToLinqToDBTable() .OrderByDescending(x => x.DateAdded)
.Where(x => x.UserId == userId) .Skip(15 * page)
.OrderByDescending(x => x.DateAdded) .Take(15)
.Skip(15 * page) .ToList();
.Take(15)
.ToListAsyncLinqToDB();
} }

View File

@@ -10,7 +10,6 @@ namespace NadekoBot.Db;
public class WaifuInfoStats public class WaifuInfoStats
{ {
public int WaifuId { get; init; }
public string FullName { get; init; } public string FullName { get; init; }
public long Price { get; init; } public long Price { get; init; }
public string ClaimerName { get; init; } public string ClaimerName { get; init; }
@@ -18,6 +17,9 @@ public class WaifuInfoStats
public int AffinityCount { get; init; } public int AffinityCount { get; init; }
public int DivorceCount { get; init; } public int DivorceCount { get; init; }
public int ClaimCount { get; init; } public int ClaimCount { get; init; }
public List<WaifuItem> Items { get; init; }
public List<string> Claims { get; init; }
public List<string> Fans { get; init; }
} }
public static class WaifuExtensions public static class WaifuExtensions
@@ -101,7 +103,6 @@ public static class WaifuExtensions
.FirstOrDefault()) .FirstOrDefault())
.Select(w => new WaifuInfoStats .Select(w => new WaifuInfoStats
{ {
WaifuId = w.WaifuId,
FullName = FullName =
ctx.Set<DiscordUser>() ctx.Set<DiscordUser>()
.AsQueryable() .AsQueryable()
@@ -134,6 +135,17 @@ public static class WaifuExtensions
&& x.NewId == null && x.NewId == null
&& x.UpdateType == WaifuUpdateType.Claimed), && x.UpdateType == WaifuUpdateType.Claimed),
Price = w.Price, Price = w.Price,
Claims = ctx.WaifuInfo.AsQueryable()
.Include(x => x.Waifu)
.Where(x => x.ClaimerId == w.WaifuId)
.Select(x => x.Waifu.Username + "#" + x.Waifu.Discriminator)
.ToList(),
Fans = ctx.WaifuInfo.AsQueryable()
.Include(x => x.Waifu)
.Where(x => x.AffinityId == w.WaifuId)
.Select(x => x.Waifu.Username + "#" + x.Waifu.Discriminator)
.ToList(),
Items = w.Items
}) })
.FirstOrDefault(); .FirstOrDefault();

View File

@@ -49,8 +49,7 @@ public enum PunishmentAction
ChatMute, ChatMute,
VoiceMute, VoiceMute,
AddRole, AddRole,
Warn, Warn
TimeOut
} }
public class AntiSpamIgnore : DbEntity public class AntiSpamIgnore : DbEntity

View File

@@ -1,9 +0,0 @@
using NadekoBot.Services.Database.Models;
namespace NadekoBot.Db.Models;
public class AutoPublishChannel : DbEntity
{
public ulong GuildId { get; set; }
public ulong ChannelId { get; set; }
}

View File

@@ -5,5 +5,4 @@ public class BanTemplate : DbEntity
{ {
public ulong GuildId { get; set; } public ulong GuildId { get; set; }
public string Text { get; set; } public string Text { get; set; }
public int? PruneDays { get; set; }
} }

View File

@@ -17,6 +17,8 @@ public class DiscordUser : DbEntity
public bool IsClubAdmin { get; set; } public bool IsClubAdmin { get; set; }
public long TotalXp { get; set; } public long TotalXp { get; set; }
public DateTime LastLevelUp { get; set; } = DateTime.UtcNow;
public DateTime LastXpGain { get; set; } = DateTime.MinValue;
public XpNotificationLocation NotifyOnLevelUp { get; set; } public XpNotificationLocation NotifyOnLevelUp { get; set; }
public long CurrencyAmount { get; set; } public long CurrencyAmount { get; set; }

View File

@@ -8,8 +8,6 @@ public class FeedSub : DbEntity
public ulong ChannelId { get; set; } public ulong ChannelId { get; set; }
public string Url { get; set; } public string Url { get; set; }
public string Message { get; set; }
public override int GetHashCode() public override int GetHashCode()
=> Url.GetHashCode(StringComparison.InvariantCulture) ^ GuildConfigId.GetHashCode(); => Url.GetHashCode(StringComparison.InvariantCulture) ^ GuildConfigId.GetHashCode();

View File

@@ -1,9 +0,0 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class GamblingStats : DbEntity
{
public string Feature { get; set; }
public decimal Bet { get; set; }
public decimal PaidOut { get; set; }
}

View File

@@ -95,8 +95,6 @@ public class GuildConfig : DbEntity
public int WarnExpireHours { get; set; } public int WarnExpireHours { get; set; }
public WarnExpireAction WarnExpireAction { get; set; } = WarnExpireAction.Clear; public WarnExpireAction WarnExpireAction { get; set; } = WarnExpireAction.Clear;
public bool DisableGlobalExpressions { get; set; } = false;
#region Boost Message #region Boost Message
public bool SendBoostMessage { get; set; } public bool SendBoostMessage { get; set; }

View File

@@ -19,10 +19,6 @@ public class LogSetting : DbEntity
public ulong? ChannelCreatedId { get; set; } public ulong? ChannelCreatedId { get; set; }
public ulong? ChannelDestroyedId { get; set; } public ulong? ChannelDestroyedId { get; set; }
public ulong? ChannelUpdatedId { get; set; } public ulong? ChannelUpdatedId { get; set; }
public ulong? ThreadDeletedId { get; set; }
public ulong? ThreadCreatedId { get; set; }
public ulong? UserMutedId { get; set; } public ulong? UserMutedId { get; set; }

View File

@@ -24,7 +24,6 @@ public class ShopEntry : DbEntity, IIndexed
//list //list
public HashSet<ShopEntryItem> Items { get; set; } = new(); public HashSet<ShopEntryItem> Items { get; set; } = new();
public ulong? RoleRequirement { get; set; }
} }
public class ShopEntryItem : DbEntity public class ShopEntryItem : DbEntity

View File

@@ -8,6 +8,7 @@ public class UserXpStats : DbEntity
public long Xp { get; set; } public long Xp { get; set; }
public long AwardedXp { get; set; } public long AwardedXp { get; set; }
public XpNotificationLocation NotifyOnLevelUp { get; set; } public XpNotificationLocation NotifyOnLevelUp { get; set; }
public DateTime LastLevelUp { get; set; } = DateTime.UtcNow;
} }
public enum XpNotificationLocation { None, Dm, Channel } public enum XpNotificationLocation { None, Dm, Channel }

View File

@@ -7,7 +7,7 @@ public class WaifuInfo : DbEntity
{ {
public int WaifuId { get; set; } public int WaifuId { get; set; }
public DiscordUser Waifu { get; set; } public DiscordUser Waifu { get; set; }
public int? ClaimerId { get; set; } public int? ClaimerId { get; set; }
public DiscordUser Claimer { get; set; } public DiscordUser Claimer { get; set; }

View File

@@ -7,4 +7,4 @@ public class WaifuItem : DbEntity
public int? WaifuInfoId { get; set; } public int? WaifuInfoId { get; set; }
public string ItemEmoji { get; set; } public string ItemEmoji { get; set; }
public string Name { get; set; } public string Name { get; set; }
} }

View File

@@ -13,6 +13,6 @@ public class XpShopOwnedItem : DbEntity
public enum XpShopItemType public enum XpShopItemType
{ {
Background = 0, Background,
Frame = 1, Frame,
} }

View File

@@ -10,6 +10,10 @@ public sealed class MysqlContext : NadekoContext
protected override string CurrencyTransactionOtherIdDefaultValue protected override string CurrencyTransactionOtherIdDefaultValue
=> "NULL"; => "NULL";
protected override string DiscordUserLastXpGainDefaultValue
=> "(UTC_TIMESTAMP - INTERVAL 1 year)";
protected override string LastLevelUpDefaultValue
=> "(UTC_TIMESTAMP)";
public MysqlContext(string connStr = "Server=localhost", string version = "8.0") public MysqlContext(string connStr = "Server=localhost", string version = "8.0")
{ {

View File

@@ -65,6 +65,8 @@ public abstract class NadekoContext : DbContext
#region Mandatory Provider-Specific Values #region Mandatory Provider-Specific Values
protected abstract string CurrencyTransactionOtherIdDefaultValue { get; } protected abstract string CurrencyTransactionOtherIdDefaultValue { get; }
protected abstract string DiscordUserLastXpGainDefaultValue { get; }
protected abstract string LastLevelUpDefaultValue { get; }
#endregion #endregion
@@ -164,6 +166,12 @@ public abstract class NadekoContext : DbContext
du.Property(x => x.NotifyOnLevelUp) du.Property(x => x.NotifyOnLevelUp)
.HasDefaultValue(XpNotificationLocation.None); .HasDefaultValue(XpNotificationLocation.None);
du.Property(x => x.LastXpGain)
.HasDefaultValueSql(DiscordUserLastXpGainDefaultValue);
du.Property(x => x.LastLevelUp)
.HasDefaultValueSql(LastLevelUpDefaultValue);
du.Property(x => x.TotalXp) du.Property(x => x.TotalXp)
.HasDefaultValue(0); .HasDefaultValue(0);
@@ -205,6 +213,9 @@ public abstract class NadekoContext : DbContext
}) })
.IsUnique(); .IsUnique();
xps.Property(x => x.LastLevelUp)
.HasDefaultValueSql(LastLevelUpDefaultValue);
xps.HasIndex(x => x.UserId); xps.HasIndex(x => x.UserId);
xps.HasIndex(x => x.GuildId); xps.HasIndex(x => x.GuildId);
xps.HasIndex(x => x.Xp); xps.HasIndex(x => x.Xp);
@@ -330,10 +341,6 @@ public abstract class NadekoContext : DbContext
#region BanTemplate #region BanTemplate
modelBuilder.Entity<BanTemplate>().HasIndex(x => x.GuildId).IsUnique(); modelBuilder.Entity<BanTemplate>().HasIndex(x => x.GuildId).IsUnique();
modelBuilder.Entity<BanTemplate>()
.Property(x => x.PruneDays)
.HasDefaultValue(null)
.IsRequired(false);
#endregion #endregion
@@ -464,22 +471,6 @@ public abstract class NadekoContext : DbContext
}); });
#endregion #endregion
#region AutoPublish
modelBuilder.Entity<AutoPublishChannel>(apc => apc
.HasIndex(x => x.GuildId)
.IsUnique());
#endregion
#region GamblingStats
modelBuilder.Entity<GamblingStats>(gs => gs
.HasIndex(x => x.Feature)
.IsUnique());
#endregion
} }
#if DEBUG #if DEBUG

View File

@@ -8,6 +8,10 @@ public sealed class PostgreSqlContext : NadekoContext
protected override string CurrencyTransactionOtherIdDefaultValue protected override string CurrencyTransactionOtherIdDefaultValue
=> "NULL"; => "NULL";
protected override string DiscordUserLastXpGainDefaultValue
=> "timezone('utc', now()) - interval '-1 year'";
protected override string LastLevelUpDefaultValue
=> "timezone('utc', now())";
public PostgreSqlContext(string connStr = "Host=localhost") public PostgreSqlContext(string connStr = "Host=localhost")
{ {

View File

@@ -9,6 +9,10 @@ public sealed class SqliteContext : NadekoContext
protected override string CurrencyTransactionOtherIdDefaultValue protected override string CurrencyTransactionOtherIdDefaultValue
=> "NULL"; => "NULL";
protected override string DiscordUserLastXpGainDefaultValue
=> "datetime('now', '-1 years')";
protected override string LastLevelUpDefaultValue
=> "datetime('now')";
public SqliteContext(string connectionString = "Data Source=data/NadekoBot.db", int commandTimeout = 60) public SqliteContext(string connectionString = "Data Source=data/NadekoBot.db", int commandTimeout = 60)
{ {

View File

@@ -19,35 +19,6 @@ namespace NadekoBot.Migrations.Mysql
.HasAnnotation("ProductVersion", "6.0.7") .HasAnnotation("ProductVersion", "6.0.7")
.HasAnnotation("Relational:MaxIdentifierLength", 64); .HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("id");
b.Property<ulong>("ChannelId")
.HasColumnType("bigint unsigned")
.HasColumnName("channelid");
b.Property<DateTime?>("DateAdded")
.HasColumnType("datetime(6)")
.HasColumnName("dateadded");
b.Property<ulong>("GuildId")
.HasColumnType("bigint unsigned")
.HasColumnName("guildid");
b.HasKey("Id")
.HasName("pk_autopublishchannel");
b.HasIndex("GuildId")
.IsUnique()
.HasDatabaseName("ix_autopublishchannel_guildid");
b.ToTable("autopublishchannel", (string)null);
});
modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b =>
{ {
b.Property<int>("Id") b.Property<int>("Id")
@@ -197,6 +168,18 @@ namespace NadekoBot.Migrations.Mysql
.HasDefaultValue(false) .HasDefaultValue(false)
.HasColumnName("isclubadmin"); .HasColumnName("isclubadmin");
b.Property<DateTime>("LastLevelUp")
.ValueGeneratedOnAdd()
.HasColumnType("datetime(6)")
.HasColumnName("lastlevelup")
.HasDefaultValueSql("(UTC_TIMESTAMP)");
b.Property<DateTime>("LastXpGain")
.ValueGeneratedOnAdd()
.HasColumnType("datetime(6)")
.HasColumnName("lastxpgain")
.HasDefaultValueSql("(UTC_TIMESTAMP - INTERVAL 1 year)");
b.Property<int>("NotifyOnLevelUp") b.Property<int>("NotifyOnLevelUp")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnType("int") .HasColumnType("int")
@@ -704,10 +687,6 @@ namespace NadekoBot.Migrations.Mysql
.HasColumnType("bigint unsigned") .HasColumnType("bigint unsigned")
.HasColumnName("guildid"); .HasColumnName("guildid");
b.Property<int?>("PruneDays")
.HasColumnType("int")
.HasColumnName("prunedays");
b.Property<string>("Text") b.Property<string>("Text")
.HasColumnType("longtext") .HasColumnType("longtext")
.HasColumnName("text"); .HasColumnName("text");
@@ -975,10 +954,6 @@ namespace NadekoBot.Migrations.Mysql
.HasColumnType("int") .HasColumnType("int")
.HasColumnName("guildconfigid"); .HasColumnName("guildconfigid");
b.Property<string>("Message")
.HasColumnType("longtext")
.HasColumnName("message");
b.Property<string>("Url") b.Property<string>("Url")
.IsRequired() .IsRequired()
.HasColumnType("varchar(255)") .HasColumnType("varchar(255)")
@@ -1105,39 +1080,6 @@ namespace NadekoBot.Migrations.Mysql
b.ToTable("filterwordschannelid", (string)null); b.ToTable("filterwordschannelid", (string)null);
}); });
modelBuilder.Entity("NadekoBot.Services.Database.Models.GamblingStats", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("id");
b.Property<decimal>("Bet")
.HasColumnType("decimal(65,30)")
.HasColumnName("bet");
b.Property<DateTime?>("DateAdded")
.HasColumnType("datetime(6)")
.HasColumnName("dateadded");
b.Property<string>("Feature")
.HasColumnType("varchar(255)")
.HasColumnName("feature");
b.Property<decimal>("PaidOut")
.HasColumnType("decimal(65,30)")
.HasColumnName("paidout");
b.HasKey("Id")
.HasName("pk_gamblingstats");
b.HasIndex("Feature")
.IsUnique()
.HasDatabaseName("ix_gamblingstats_feature");
b.ToTable("gamblingstats", (string)null);
});
modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b => modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
{ {
b.Property<int>("Id") b.Property<int>("Id")
@@ -1262,10 +1204,6 @@ namespace NadekoBot.Migrations.Mysql
.HasColumnType("tinyint(1)") .HasColumnType("tinyint(1)")
.HasColumnName("deletestreamonlinemessage"); .HasColumnName("deletestreamonlinemessage");
b.Property<bool>("DisableGlobalExpressions")
.HasColumnType("tinyint(1)")
.HasColumnName("disableglobalexpressions");
b.Property<string>("DmGreetMessageText") b.Property<string>("DmGreetMessageText")
.HasColumnType("longtext") .HasColumnType("longtext")
.HasColumnName("dmgreetmessagetext"); .HasColumnName("dmgreetmessagetext");
@@ -1522,14 +1460,6 @@ namespace NadekoBot.Migrations.Mysql
.HasColumnType("bigint unsigned") .HasColumnType("bigint unsigned")
.HasColumnName("messageupdatedid"); .HasColumnName("messageupdatedid");
b.Property<ulong?>("ThreadCreatedId")
.HasColumnType("bigint unsigned")
.HasColumnName("threadcreatedid");
b.Property<ulong?>("ThreadDeletedId")
.HasColumnType("bigint unsigned")
.HasColumnName("threaddeletedid");
b.Property<ulong?>("UserBannedId") b.Property<ulong?>("UserBannedId")
.HasColumnType("bigint unsigned") .HasColumnType("bigint unsigned")
.HasColumnName("userbannedid"); .HasColumnName("userbannedid");
@@ -2314,10 +2244,6 @@ namespace NadekoBot.Migrations.Mysql
.HasColumnType("longtext") .HasColumnType("longtext")
.HasColumnName("rolename"); .HasColumnName("rolename");
b.Property<ulong?>("RoleRequirement")
.HasColumnType("bigint unsigned")
.HasColumnName("rolerequirement");
b.Property<int>("Type") b.Property<int>("Type")
.HasColumnType("int") .HasColumnType("int")
.HasColumnName("type"); .HasColumnName("type");
@@ -2639,6 +2565,12 @@ namespace NadekoBot.Migrations.Mysql
.HasColumnType("bigint unsigned") .HasColumnType("bigint unsigned")
.HasColumnName("guildid"); .HasColumnName("guildid");
b.Property<DateTime>("LastLevelUp")
.ValueGeneratedOnAdd()
.HasColumnType("datetime(6)")
.HasColumnName("lastlevelup")
.HasDefaultValueSql("(UTC_TIMESTAMP)");
b.Property<int>("NotifyOnLevelUp") b.Property<int>("NotifyOnLevelUp")
.HasColumnType("int") .HasColumnType("int")
.HasColumnName("notifyonlevelup"); .HasColumnName("notifyonlevelup");

View File

@@ -1,49 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace NadekoBot.Migrations.Mysql
{
public partial class removeobsoletexpcolumns : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "lastlevelup",
table: "userxpstats");
migrationBuilder.DropColumn(
name: "lastlevelup",
table: "discorduser");
migrationBuilder.DropColumn(
name: "lastxpgain",
table: "discorduser");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<DateTime>(
name: "lastlevelup",
table: "userxpstats",
type: "datetime(6)",
nullable: false,
defaultValueSql: "(UTC_TIMESTAMP)");
migrationBuilder.AddColumn<DateTime>(
name: "lastlevelup",
table: "discorduser",
type: "datetime(6)",
nullable: false,
defaultValueSql: "(UTC_TIMESTAMP)");
migrationBuilder.AddColumn<DateTime>(
name: "lastxpgain",
table: "discorduser",
type: "datetime(6)",
nullable: false,
defaultValueSql: "(UTC_TIMESTAMP - INTERVAL 1 year)");
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,25 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace NadekoBot.Migrations.Mysql
{
public partial class banprune : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "prunedays",
table: "bantemplates",
type: "int",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "prunedays",
table: "bantemplates");
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,25 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace NadekoBot.Migrations.Mysql
{
public partial class shoprolereq : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<ulong>(
name: "rolerequirement",
table: "shopentry",
type: "bigint unsigned",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "rolerequirement",
table: "shopentry");
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,42 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace NadekoBot.Migrations.Mysql
{
public partial class autopub : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "autopublishchannel",
columns: table => new
{
id = table.Column<int>(type: "int", nullable: false)
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
guildid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
channelid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
dateadded = table.Column<DateTime>(type: "datetime(6)", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("pk_autopublishchannel", x => x.id);
})
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateIndex(
name: "ix_autopublishchannel_guildid",
table: "autopublishchannel",
column: "guildid",
unique: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "autopublishchannel");
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,44 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace NadekoBot.Migrations.Mysql
{
public partial class gamblingstats : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "gamblingstats",
columns: table => new
{
id = table.Column<int>(type: "int", nullable: false)
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
feature = table.Column<string>(type: "varchar(255)", nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
bet = table.Column<decimal>(type: "decimal(65,30)", nullable: false),
paidout = table.Column<decimal>(type: "decimal(65,30)", nullable: false),
dateadded = table.Column<DateTime>(type: "datetime(6)", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("pk_gamblingstats", x => x.id);
})
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateIndex(
name: "ix_gamblingstats_feature",
table: "gamblingstats",
column: "feature",
unique: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "gamblingstats");
}
}
}

View File

@@ -1,26 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace NadekoBot.Migrations.Mysql
{
public partial class toggleglobalexpressions : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "disableglobalexpressions",
table: "guildconfigs",
type: "tinyint(1)",
nullable: false,
defaultValue: false);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "disableglobalexpressions",
table: "guildconfigs");
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,35 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace NadekoBot.Migrations.Mysql
{
public partial class logthread : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<ulong>(
name: "threadcreatedid",
table: "logsettings",
type: "bigint unsigned",
nullable: true);
migrationBuilder.AddColumn<ulong>(
name: "threaddeletedid",
table: "logsettings",
type: "bigint unsigned",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "threadcreatedid",
table: "logsettings");
migrationBuilder.DropColumn(
name: "threaddeletedid",
table: "logsettings");
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,26 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace NadekoBot.Migrations.Mysql
{
public partial class feedtext : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "message",
table: "feedsub",
type: "longtext",
nullable: true)
.Annotation("MySql:CharSet", "utf8mb4");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "message",
table: "feedsub");
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,25 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace NadekoBot.Migrations.PostgreSql
{
public partial class banprune : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "prunedays",
table: "bantemplates",
type: "integer",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "prunedays",
table: "bantemplates");
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,25 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace NadekoBot.Migrations.PostgreSql
{
public partial class shoprolereq : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<decimal>(
name: "rolerequirement",
table: "shopentry",
type: "numeric(20,0)",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "rolerequirement",
table: "shopentry");
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,51 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace NadekoBot.Migrations.PostgreSql
{
public partial class autopub : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<decimal>(
name: "rolerequirement",
table: "shopentry",
type: "numeric(20,0)",
nullable: true);
migrationBuilder.CreateTable(
name: "autopublishchannel",
columns: table => new
{
id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
guildid = table.Column<decimal>(type: "numeric(20,0)", nullable: false),
channelid = table.Column<decimal>(type: "numeric(20,0)", nullable: false),
dateadded = table.Column<DateTime>(type: "timestamp without time zone", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("pk_autopublishchannel", x => x.id);
});
migrationBuilder.CreateIndex(
name: "ix_autopublishchannel_guildid",
table: "autopublishchannel",
column: "guildid",
unique: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "autopublishchannel");
migrationBuilder.DropColumn(
name: "rolerequirement",
table: "shopentry");
}
}
}

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More