Compare commits

..

8 Commits
5.0.0 ... 5.0.3

Author SHA1 Message Date
Kwoth
6f4cbddcad dev: Changed some namespaces. Pushing tags, Releasing 5.0.3 2024-05-10 05:56:02 +00:00
Kwoth
40528150f7 dev: Revert links back in the code, check for updates in the original nadekobot project 2024-05-10 04:58:25 +00:00
Kwoth
2b80823a1b docs: revert links back to kwoth/nadekobot as gitlab's organization thing is a ripoff 2024-05-10 04:56:26 +00:00
Kwoth
37ee769119 docs: Changed changelog version to 5.0.2 to avoid confusion 2024-05-10 02:56:14 +00:00
Kwoth
cfd39ebbd5 fix: windows exe shouldn't ask for .net to be installed anymore
fix: Version number is now correct
docs: Updated .net version name in the docs
2024-05-10 02:05:35 +00:00
Kwoth
0532b30f7f docs: updated docs to point to the new installer location 2024-05-09 14:17:25 +00:00
Kwoth
b92a38f49d docs: Changelog updated 2024-05-09 13:37:38 +00:00
Kwoth
81711c557a ci: give up on single file, try to fix docker, medusa builds 2024-05-09 13:30:02 +00:00
33 changed files with 69 additions and 65 deletions

View File

@@ -30,12 +30,12 @@ variables:
build: build:
stage: build stage: build
script: script:
- "dotnet publish -c Release -r linux-x64 --self-contained -p:PublishSingleFile=true -o $LINUX_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj" - "dotnet publish -c Release -r linux-x64 --self-contained -o $LINUX_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
- "dotnet publish -c Release -r linux-arm64 --self-contained -p:PublishSingleFile=true -o $LINUX_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj" - "dotnet publish -c Release -r linux-arm64 --self-contained -o $LINUX_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
- "dotnet publish -c Release -r win-x64 --self-contained -p:PublishSingleFile=true -o $WIN_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj" - "dotnet publish -c Release -r win-x64 --self-contained -o $WIN_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
- "dotnet publish -c Release -r win-arm64 --self-contained -p:PublishSingleFile=true -o $WIN_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj" - "dotnet publish -c Release -r win-arm64 --self-contained -o $WIN_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
- "dotnet publish -c Release -r osx-x64 --self-contained -p:PublishSingleFile=true -o $MACOS_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj" - "dotnet publish -c Release -r osx-x64 --self-contained -o $MACOS_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
- "dotnet publish -c Release -r osx-arm64 --self-contained -p:PublishSingleFile=true -o $MACOS_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj" - "dotnet publish -c Release -r osx-arm64 --self-contained -o $MACOS_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
artifacts: artifacts:
paths: paths:
- "$LINUX_X64_OUTPUT_DIR/" - "$LINUX_X64_OUTPUT_DIR/"
@@ -81,7 +81,7 @@ release:
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
script: script:
- | - |
release-cli create --name "NadekoBot v$CI_COMMIT_TAG" --description "## [Changelog](https://gitlab.com/nadeko/nadekobot/-/blob/v5/CHANGELOG.md#$(echo "$CI_COMMIT_TAG" | sed "s/\.//g")-$(date +%d%m%Y))" --tag-name $CI_COMMIT_TAG \ release-cli create --name "NadekoBot v$CI_COMMIT_TAG" --description "## [Changelog](https://gitlab.com/kwoth/nadekobot/-/blob/v5/CHANGELOG.md#$(echo "$CI_COMMIT_TAG" | sed "s/\.//g")-$(date +%d%m%Y))" --tag-name $CI_COMMIT_TAG \
--assets-link "{\"name\":\"${LINUX_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${LINUX_X64_RELEASE}\"}" \ --assets-link "{\"name\":\"${LINUX_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${LINUX_X64_RELEASE}\"}" \
--assets-link "{\"name\":\"${LINUX_ARM64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${LINUX_ARM64_RELEASE}\"}" \ --assets-link "{\"name\":\"${LINUX_ARM64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${LINUX_ARM64_RELEASE}\"}" \
--assets-link "{\"name\":\"${WIN_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WIN_X64_RELEASE}\"}" \ --assets-link "{\"name\":\"${WIN_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WIN_X64_RELEASE}\"}" \
@@ -113,7 +113,7 @@ build-installer:
script: script:
- dotnet clean - dotnet clean
- dotnet restore -f --no-cache -v n - dotnet restore -f --no-cache -v n
- dotnet publish -c Release -p:PublishSingleFile=true --runtime win-x64 /p:Version=$CI_COMMIT_TAG src/NadekoBot - dotnet publish -c Release --self-contained --runtime win-x64 /p:Version=$CI_COMMIT_TAG src/NadekoBot
- $env:NADEKOBOT_INSTALL_VERSION = $CI_COMMIT_TAG - $env:NADEKOBOT_INSTALL_VERSION = $CI_COMMIT_TAG
- iscc.exe "/O+" ".\exe_builder.iss" - iscc.exe "/O+" ".\exe_builder.iss"
tags: tags:
@@ -121,11 +121,12 @@ build-installer:
publish-medusa-package: publish-medusa-package:
stage: publish-medusa-package stage: publish-medusa-package
allow_failure: true
rules: rules:
- 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-alpha$CI_COMMIT_SHORT_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,7 +2,7 @@
Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
## [5.0.0] ## [5.0.3] - 10.05.2024
### Added ### Added
@@ -71,7 +71,7 @@ Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except da
- Removed log voice presence TTS - Removed log voice presence TTS
- Cleanup: Removed a lot of obsolete aliases from aliases.yml - Cleanup: Removed a lot of obsolete aliases from aliases.yml
## [4.3.22] - 23.04.2023 ## [4.3.22] - 23.04.2024
### Added ### Added
- Added `.setbanner` command (thx cata) - Added `.setbanner` command (thx cata)
@@ -80,7 +80,7 @@ Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except da
- Fixed pagination error due to a missing emoji - Fixed pagination error due to a missing emoji
## [4.3.21] - 19.04.2023 ## [4.3.21] - 19.04.2024
### Fixed ### Fixed
- Possible fix for a duplicate in `.h bank` - Possible fix for a duplicate in `.h bank`

View File

@@ -27,7 +27,7 @@ RUN set -xe; \
useradd -m nadeko; \ useradd -m nadeko; \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends libopus0 libsodium23 libsqlite3-0 curl ffmpeg python3 sudo; \ apt-get install -y --no-install-recommends libopus0 libsodium23 libsqlite3-0 curl ffmpeg python3 sudo; \
update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1; \ update-alternatives --install /usr/local/bin/python python /usr/bin/python3.9 1; \
echo 'Defaults>nadeko env_keep+="ASPNETCORE_* DOTNET_* NadekoBot_* shard_id total_shards TZ"' > /etc/sudoers.d/nadeko; \ echo 'Defaults>nadeko env_keep+="ASPNETCORE_* DOTNET_* NadekoBot_* shard_id total_shards TZ"' > /etc/sudoers.d/nadeko; \
curl -Lo /usr/local/bin/yt-dlp https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp; \ curl -Lo /usr/local/bin/yt-dlp https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp; \
chmod a+rx /usr/local/bin/yt-dlp; \ chmod a+rx /usr/local/bin/yt-dlp; \

View File

@@ -1,6 +1,6 @@
# How to contribute # How to contribute
1. Make Merge Requests to the [**v5 branch**](https://gitlab.com/nadeko/nadekobot/tree/v5) 1. Make Merge Requests to the [**v5 branch**](https://gitlab.com/kwoth/nadekobot/tree/v5)
2. Keep a single Merge Request to a single feature 2. Keep a single Merge Request to a single feature
3. Fill out the MR template 3. Fill out the MR template

View File

@@ -30,7 +30,7 @@ You can also donate to us through [PayPal][paypal] for one-time donations using
[![img][paypal-button]][paypal] [![img][paypal-button]][paypal]
[gitlab]: https://gitlab.com/nadeko/nadekobot [gitlab]: https://gitlab.com/kwoth/nadekobot
[discord-server]: https://discord.nadeko.bot/ [discord-server]: https://discord.nadeko.bot/
[patreon]: https://www.patreon.com/nadekobot [patreon]: https://www.patreon.com/nadekobot
[patreon-button]: ./assets/patreon.png [patreon-button]: ./assets/patreon.png

View File

@@ -14,7 +14,7 @@
version: "3.7" version: "3.7"
services: services:
nadeko: nadeko:
image: registry.gitlab.com/nadeko/nadekobot:latest image: registry.gitlab.com/kwoth/nadekobot:latest
depends_on: depends_on:
- redis - redis
environment: environment:

View File

@@ -15,12 +15,11 @@
##### Compatible operating systems: ##### Compatible operating systems:
- Ubuntu: 18.04, 20.04, 22.04, 22.10 - Ubuntu: 20.04, 22.04, 22.10 +
- Mint: 19, 20, 21 - Debian: 11 +
- Debian: 10, 11
- CentOS: 7 - CentOS: 7
- openSUSE 15 - openSUSE 15
- ~~Fedora: 33, 34, 35~~ (Fedora is Pending Support) - Fedora: 33, 34, 35
## Linux From Source ## Linux From Source
@@ -28,7 +27,7 @@
Follow the following few steps only if you're migrating from v3. If not, skip to installation instructions. Follow the following few steps only if you're migrating from v3. If not, skip to installation instructions.
Use the new installer script: `cd ~ && wget -N https://gitlab.com/Kwoth/nadeko-bash-installer/-/raw/v5/linuxAIO.sh && bash linuxAIO.sh` Use the new installer script: `cd ~ && wget -N https://gitlab.com/kwoth/nadeko-bash-installer/-/raw/v5/linuxAIO.sh && bash linuxAIO.sh`
> - Install prerequisites (type `1` and press `enter`) > - Install prerequisites (type `1` and press `enter`)
> - Download (type `2` and press `enter`) > - Download (type `2` and press `enter`)
> - Run (type `3` and press `enter`) > - Run (type `3` and press `enter`)
@@ -38,7 +37,7 @@ Use the new installer script: `cd ~ && wget -N https://gitlab.com/Kwoth/nadeko-
Open Terminal (if you're on an installation with a window manager) and navigate to the location where you want to install the bot (for example `cd ~`) Open Terminal (if you're on an installation with a window manager) and navigate to the location where you want to install the bot (for example `cd ~`)
1. Download and run the **new** installer script `cd ~ && wget -N https://gitlab.com/Kwoth/nadeko-bash-installer/-/raw/v5/linuxAIO.sh && bash linuxAIO.sh` 1. Download and run the **new** installer script `cd ~ && wget -N https://gitlab.com/kwoth/nadeko-bash-installer/-/raw/v5/linuxAIO.sh && bash linuxAIO.sh`
2. Install prerequisites (type `1` and press enter) 2. Install prerequisites (type `1` and press enter)
3. Download the bot (type `2` and press enter) 3. Download the bot (type `2` and press enter)
4. Exit the installer (type `6` and press enter) 4. Exit the installer (type `6` and press enter)
@@ -50,13 +49,13 @@ Open Terminal (if you're on an installation with a window manager) and navigate
- `CTRL` + `X` - `CTRL` + `X`
- `Y` - `Y`
- `Enter` - `Enter`
8. Run the installer script again `cd ~ && wget -N https://gitlab.com/Kwoth/nadeko-bash-installer/-/raw/v5/linuxAIO.sh && bash linuxAIO.sh` 8. Run the installer script again `cd ~ && wget -N https://gitlab.com/kwoth/nadeko-bash-installer/-/raw/v5/linuxAIO.sh && bash linuxAIO.sh`
9. Run the bot (type `3` and press enter) 9. Run the bot (type `3` and press enter)
##### Source Update Instructions ##### Source Update Instructions
1. ⚠ Stop the bot ⚠ 1. ⚠ Stop the bot ⚠
2. Update and run the **new** installer script `cd ~ && wget -N https://gitlab.com/Kwoth/nadeko-bash-installer/-/raw/v5/linuxAIO.sh && bash linuxAIO.sh` 2. Update and run the **new** installer script `cd ~ && wget -N https://gitlab.com/kwoth/nadeko-bash-installer/-/raw/v5/linuxAIO.sh && bash linuxAIO.sh`
3. Update the bot (type `2` and press enter) 3. Update the bot (type `2` and press enter)
4. Run the bot (type `3` and press enter) 4. Run the bot (type `3` and press enter)
5. 🎉 5. 🎉
@@ -74,11 +73,11 @@ Open Terminal (if you're on an installation with a window manager) and navigate
3. Make sure your python is version 3+ with `python --version` 3. Make sure your python is version 3+ with `python --version`
- if it's not, you can install python 3 and make it the default with: `sudo apt-get install python3.8 python-is-python3` - if it's not, you can install python 3 and make it the default with: `sudo apt-get install python3.8 python-is-python3`
*You can use nadeko bash script [prerequisites installer](https://gitlab.com/Kwoth/nadeko-bash-installer/-/blob/v5/n-prereq.sh) as a reference* *You can use nadeko bash script [prerequisites installer](https://gitlab.com/kwoth/nadeko-bash-installer/-/blob/v5/n-prereq.sh) as a reference*
##### Installation Instructions ##### Installation Instructions
1. Download the latest release from <https://gitlab.com/nadeko/nadekobot/-/releases> 1. Download the latest release from <https://gitlab.com/kwoth/nadekobot/-/releases>
- Look for the file called "X.XX.X-linux-x64-build.tar" (where X.XX.X is a series of numbers) and download it - Look for the file called "X.XX.X-linux-x64-build.tar" (where X.XX.X is a series of numbers) and download it
2. Untar it 2. Untar it
- ⚠ Make sure that you change X.XX.X to the same series of numbers as in step 1! - ⚠ Make sure that you change X.XX.X to the same series of numbers as in step 1!
@@ -102,7 +101,7 @@ Open Terminal (if you're on an installation with a window manager) and navigate
##### Release Update Instructions ##### Release Update Instructions
1. Stop the bot 1. Stop the bot
2. Download the latest release from <https://gitlab.com/nadeko/nadekobot/-/releases> 2. Download the latest release from <https://gitlab.com/kwoth/nadekobot/-/releases>
- Look for the file called "x.x.x-linux-x64-build.tar" (where `X.X.X` is a version, for example 3.0.4) and download it - Look for the file called "x.x.x-linux-x64-build.tar" (where `X.X.X` is a version, for example 3.0.4) and download it
3. Untar it 3. Untar it
- ⚠ Make sure that you change `X.X.X` to the same series of numbers as in step 2! - ⚠ Make sure that you change `X.X.X` to the same series of numbers as in step 2!

View File

@@ -31,7 +31,7 @@ sudo ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/
##### Installation Instructions ##### Installation Instructions
1. Download and run the **new** installer script `cd ~ && wget -N https://gitlab.com/Kwoth/nadeko-bash-installer/-/raw/v5/linuxAIO.sh && bash linuxAIO.sh` 1. Download and run the **new** installer script `cd ~ && wget -N https://gitlab.com/kwoth/nadeko-bash-installer/-/raw/v5/linuxAIO.sh && bash linuxAIO.sh`
2. Install prerequisites (type `1` and press enter) 2. Install prerequisites (type `1` and press enter)
3. Download the bot (type `2` and press enter) 3. Download the bot (type `2` and press enter)
4. Exit the installer in order to set up your `creds.yml` 4. Exit the installer in order to set up your `creds.yml`
@@ -49,7 +49,7 @@ sudo ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/
##### Update Instructions ##### Update Instructions
1. ⚠ Stop the bot 1. ⚠ Stop the bot
2. Update and run the **new** installer script `cd ~ && wget -N https://gitlab.com/Kwoth/nadeko-bash-installer/-/raw/v5/linuxAIO.sh && bash linuxAIO.sh` 2. Update and run the **new** installer script `cd ~ && wget -N https://gitlab.com/kwoth/nadeko-bash-installer/-/raw/v5/linuxAIO.sh && bash linuxAIO.sh`
3. Update the bot (type `2` and press enter) 3. Update the bot (type `2` and press enter)
4. Run the bot (type `3` and press enter) 4. Run the bot (type `3` and press enter)
5. 🎉 5. 🎉
@@ -60,7 +60,7 @@ sudo ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/
##### Installation Instructions ##### Installation Instructions
1. Download the latest release from <https://gitlab.com/nadeko/nadekobot/-/releases> 1. Download the latest release from <https://gitlab.com/kwoth/nadekobot/-/releases>
- Look for the file called "X.XX.X-linux-x64-build.tar" (where X.XX.X is a series of numbers) and download it - Look for the file called "X.XX.X-linux-x64-build.tar" (where X.XX.X is a series of numbers) and download it
2. Untar it 2. Untar it
⚠ Make sure that you change X.XX.X to the same series of numbers as in step 1! ⚠ Make sure that you change X.XX.X to the same series of numbers as in step 1!
@@ -84,7 +84,7 @@ sudo ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/
##### Update Instructions ##### Update Instructions
1. Stop the bot 1. Stop the bot
2. Download the latest release from <https://gitlab.com/nadeko/nadekobot/-/releases> 2. Download the latest release from <https://gitlab.com/kwoth/nadekobot/-/releases>
- Look for the file called "X.XX.X-linux-x64-build.tar" (where X.XX.X is a series of numbers) and download it - Look for the file called "X.XX.X-linux-x64-build.tar" (where X.XX.X is a series of numbers) and download it
3. Untar it 3. Untar it
⚠ Make sure that you change X.XX.X to the same series of numbers as in step 2! ⚠ Make sure that you change X.XX.X to the same series of numbers as in step 2!

View File

@@ -67,7 +67,7 @@ You can still install them manually:
##### Prerequisites ##### Prerequisites
**Install these before proceeding or your bot will not work!** **Install these before proceeding or your bot will not work!**
- [.net 7](https://dotnet.microsoft.com/en-us/download) - needed to compile and run the bot - [.net 8](https://dotnet.microsoft.com/en-us/download) - needed to compile and run the bot
- [git](https://git-scm.com/downloads) - needed to clone the repository (you can also download the zip manually and extract it, but this guide assumes you're using git) - [git](https://git-scm.com/downloads) - needed to clone the repository (you can also download the zip manually and extract it, but this guide assumes you're using git)
- [Redis] (OPTIONAL)- to cache things needed by some features and persist through restarts - [Redis] (OPTIONAL)- to cache things needed by some features and persist through restarts
@@ -75,7 +75,7 @@ You can still install them manually:
Open PowerShell (press windows button on your keyboard and type powershell, it should show up; alternatively, right click the start menu and select Windows PowerShell), and navigate to the location where you want to install the bot (for example `cd ~/Desktop/`) Open PowerShell (press windows button on your keyboard and type powershell, it should show up; alternatively, right click the start menu and select Windows PowerShell), and navigate to the location where you want to install the bot (for example `cd ~/Desktop/`)
1. `git clone https://gitlab.com/nadeko/nadekobot -b v5 --depth 1` 1. `git clone https://gitlab.com/kwoth/nadekobot -b v5 --depth 1`
2. `cd nadekobot` 2. `cd nadekobot`
3. `dotnet publish -c Release -o output/ src/NadekoBot/` 3. `dotnet publish -c Release -o output/ src/NadekoBot/`
4. `cd output` 4. `cd output`

View File

@@ -36,6 +36,6 @@ If you're unsure whether something is an issue, ask in our support server first.
[macos-guide]: ./guides/osx-guide.md [macos-guide]: ./guides/osx-guide.md
[from-source-guide]: ./guides/from-source.md [from-source-guide]: ./guides/from-source.md
[discord-server]: https://discord.nadeko.bot/ [discord-server]: https://discord.nadeko.bot/
[gitlab]: https://gitlab.com/nadeko/nadekobot [gitlab]: https://gitlab.com/kwoth/nadekobot
[issues]: https://gitlab.com/nadeko/nadekobot/issues [issues]: https://gitlab.com/kwoth/nadekobot/issues
[donate]: ./donate.md [donate]: ./donate.md

View File

@@ -8,7 +8,7 @@ Medusa system allows you to write independent medusae (known as "modules", "cogs
The system itself borrows some design from the current way Nadeko's Modules are written but mostly from never-released `Ayu.Commands` system which was designed to be used for a full Nadeko v3 rewrite. The system itself borrows some design from the current way Nadeko's Modules are written but mostly from never-released `Ayu.Commands` system which was designed to be used for a full Nadeko v3 rewrite.
The medusa base classes used for development are open source [here](https://gitlab.com/nadeko/nadekobot/-/tree/v5/src/Nadeko.Medusa) in case you need reference, as there is no generated documentation at the moment. The medusa base classes used for development are open source [here](https://gitlab.com/kwoth/nadekobot/-/tree/v5/src/Nadeko.Medusa) in case you need reference, as there is no generated documentation at the moment.
### Term list ### Term list
@@ -161,7 +161,7 @@ This section will guide you through how to create a simple custom medusa. You ca
</PackageReference> </PackageReference>
<!-- Note: If you want to use NadekoBot services etc... You will have to manually clone <!-- Note: If you want to use NadekoBot services etc... You will have to manually clone
the https://gitlab.com/nadeko/nadekobot repo locally and reference the NadekoBot.csproj because there is no NadekoBot package atm. the https://gitlab.com/kwoth/nadekobot repo locally and reference the NadekoBot.csproj because there is no NadekoBot package atm.
It is strongly recommended that you checkout a specific tag which matches your version of nadeko, It is strongly recommended that you checkout a specific tag which matches your version of nadeko,
as there could be breaking changes even between minor versions of NadekoBot. as there could be breaking changes even between minor versions of NadekoBot.
For example if you're running NadekoBot 4.1.0 locally for which you want to create a medusa for, For example if you're running NadekoBot 4.1.0 locally for which you want to create a medusa for,

View File

@@ -19,7 +19,7 @@ public sealed class CheckForUpdatesService : INService, IReadyExecutor
private readonly IMessageSenderService _sender; private readonly IMessageSenderService _sender;
private const string RELEASES_URL = "https://gitlab.com/api/v4/projects/57687445/releases"; private const string RELEASES_URL = "https://gitlab.com/api/v4/projects/9321079/releases";
public CheckForUpdatesService( public CheckForUpdatesService(
BotConfigService bcs, BotConfigService bcs,
@@ -72,7 +72,7 @@ public sealed class CheckForUpdatesService : INService, IReadyExecutor
UpdateLastKnownVersion(latestVersion); UpdateLastKnownVersion(latestVersion);
// pull changelog // pull changelog
var changelog = await http.GetStringAsync("https://gitlab.com/nadeko/nadekobot/-/raw/v5/CHANGELOG.md"); var changelog = await http.GetStringAsync("https://gitlab.com/kwoth/nadekobot/-/raw/v5/CHANGELOG.md");
var thisVersionChangelog = GetVersionChangelog(latestVersion, changelog); var thisVersionChangelog = GetVersionChangelog(latestVersion, changelog);
@@ -95,7 +95,7 @@ public sealed class CheckForUpdatesService : INService, IReadyExecutor
.WithOkColor() .WithOkColor()
.WithAuthor($"NadekoBot v{latest} Released!") .WithAuthor($"NadekoBot v{latest} Released!")
.WithTitle("Changelog") .WithTitle("Changelog")
.WithUrl("https://gitlab.com/nadeko/nadekobot/-/blob/v5/CHANGELOG.md") .WithUrl("https://gitlab.com/kwoth/nadekobot/-/blob/v5/CHANGELOG.md")
.WithDescription(thisVersionChangelog.TrimTo(4096)) .WithDescription(thisVersionChangelog.TrimTo(4096))
.WithFooter( .WithFooter(
"You may disable these messages by typing '.conf bot checkforupdates false'"); "You may disable these messages by typing '.conf bot checkforupdates false'");

View File

@@ -1,4 +1,4 @@
namespace Nadeko.Econ.Gambling; namespace NadekoBot.Modules.Gambling;
public readonly struct FlipResult public readonly struct FlipResult
{ {

View File

@@ -11,7 +11,7 @@ using NadekoBot.Services.Currency;
using System.Collections.Immutable; using System.Collections.Immutable;
using System.Globalization; using System.Globalization;
using System.Text; using System.Text;
using Nadeko.Econ.Gambling.Rps; using NadekoBot.Modules.Gambling.Rps;
using NadekoBot.Common.TypeReaders; using NadekoBot.Common.TypeReaders;
using NadekoBot.Modules.Patronage; using NadekoBot.Modules.Patronage;

View File

@@ -7,7 +7,7 @@ using SixLabors.ImageSharp;
using SixLabors.ImageSharp.Drawing.Processing; using SixLabors.ImageSharp.Drawing.Processing;
using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing;
using Nadeko.Econ.Gambling; using NadekoBot.Modules.Gambling;
using NadekoBot.Common.TypeReaders; using NadekoBot.Common.TypeReaders;
using Color = SixLabors.ImageSharp.Color; using Color = SixLabors.ImageSharp.Color;
using Image = SixLabors.ImageSharp.Image; using Image = SixLabors.ImageSharp.Image;

View File

@@ -1,7 +1,7 @@
#nullable disable #nullable disable
using Nadeko.Econ.Gambling; using NadekoBot.Modules.Gambling;
using Nadeko.Econ.Gambling.Betdraw; using NadekoBot.Modules.Gambling.Betdraw;
using Nadeko.Econ.Gambling.Rps; using NadekoBot.Modules.Gambling.Rps;
using OneOf; using OneOf;
namespace NadekoBot.Modules.Gambling; namespace NadekoBot.Modules.Gambling;

View File

@@ -1,7 +1,7 @@
#nullable disable #nullable disable
using Nadeko.Econ.Gambling; using NadekoBot.Modules.Gambling;
using Nadeko.Econ.Gambling.Betdraw; using NadekoBot.Modules.Gambling.Betdraw;
using Nadeko.Econ.Gambling.Rps; using NadekoBot.Modules.Gambling.Rps;
using NadekoBot.Modules.Gambling.Services; using NadekoBot.Modules.Gambling.Services;
using OneOf; using OneOf;

View File

@@ -519,7 +519,7 @@ public sealed class Help : NadekoModule<HelpService>
=> smc.RespondConfirmAsync(_sender, => smc.RespondConfirmAsync(_sender,
""" """
- In case you don't want or cannot Donate to NadekoBot project, but you - In case you don't want or cannot Donate to NadekoBot project, but you
- NadekoBot is a free and [open source](https://gitlab.com/nadeko/nadekobot) project which means you can run your own "selfhosted" instance on your computer. - NadekoBot is a free and [open source](https://gitlab.com/kwoth/nadekobot) project which means you can run your own "selfhosted" instance on your computer.
*Keep in mind that running the bot on your computer means that the bot will be offline when you turn off your computer* *Keep in mind that running the bot on your computer means that the bot will be offline when you turn off your computer*

View File

@@ -5,7 +5,7 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>true</ImplicitUsings> <ImplicitUsings>true</ImplicitUsings>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages> <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
<Version>5.0.0</Version> <Version>5.0.3</Version>
<!-- Output/build --> <!-- Output/build -->
<RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory> <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>

View File

@@ -1,4 +1,4 @@
namespace Nadeko.Econ.Gambling.Betdraw; namespace NadekoBot.Modules.Gambling.Betdraw;
public enum BetdrawColorGuess public enum BetdrawColorGuess
{ {

View File

@@ -1,4 +1,6 @@
namespace Nadeko.Econ.Gambling.Betdraw; using Nadeko.Econ;
namespace NadekoBot.Modules.Gambling.Betdraw;
public sealed class BetdrawGame public sealed class BetdrawGame
{ {

View File

@@ -1,4 +1,6 @@
namespace Nadeko.Econ.Gambling.Betdraw; using Nadeko.Econ;
namespace NadekoBot.Modules.Gambling.Betdraw;
public readonly struct BetdrawResult public readonly struct BetdrawResult
{ {

View File

@@ -1,4 +1,4 @@
namespace Nadeko.Econ.Gambling.Betdraw; namespace NadekoBot.Modules.Gambling.Betdraw;
public enum BetdrawResultType public enum BetdrawResultType
{ {

View File

@@ -1,4 +1,4 @@
namespace Nadeko.Econ.Gambling.Betdraw; namespace NadekoBot.Modules.Gambling.Betdraw;
public enum BetdrawValueGuess public enum BetdrawValueGuess
{ {

View File

@@ -1,4 +1,4 @@
namespace Nadeko.Econ.Gambling; namespace NadekoBot.Modules.Gambling;
public sealed class BetflipGame public sealed class BetflipGame
{ {

View File

@@ -1,4 +1,4 @@
namespace Nadeko.Econ.Gambling; namespace NadekoBot.Modules.Gambling;
public readonly struct BetflipResult public readonly struct BetflipResult
{ {

View File

@@ -1,4 +1,4 @@
namespace Nadeko.Econ.Gambling; namespace NadekoBot.Modules.Gambling;
public sealed class BetrollGame public sealed class BetrollGame
{ {

View File

@@ -1,4 +1,4 @@
namespace Nadeko.Econ.Gambling; namespace NadekoBot.Modules.Gambling;
public readonly struct BetrollResult public readonly struct BetrollResult
{ {

View File

@@ -1,4 +1,4 @@
namespace Nadeko.Econ.Gambling.Rps; namespace NadekoBot.Modules.Gambling.Rps;
public sealed class RpsGame public sealed class RpsGame
{ {

View File

@@ -1,4 +1,4 @@
namespace Nadeko.Econ.Gambling; namespace NadekoBot.Modules.Gambling;
//here is a payout chart //here is a payout chart
//https://lh6.googleusercontent.com/-i1hjAJy_kN4/UswKxmhrbPI/AAAAAAAAB1U/82wq_4ZZc-Y/DE6B0895-6FC1-48BE-AC4F-14D1B91AB75B.jpg //https://lh6.googleusercontent.com/-i1hjAJy_kN4/UswKxmhrbPI/AAAAAAAAB1U/82wq_4ZZc-Y/DE6B0895-6FC1-48BE-AC4F-14D1B91AB75B.jpg

View File

@@ -1,4 +1,4 @@
namespace Nadeko.Econ.Gambling; namespace NadekoBot.Modules.Gambling;
public readonly struct SlotResult public readonly struct SlotResult
{ {

View File

@@ -1,4 +1,4 @@
namespace Nadeko.Econ.Gambling; namespace NadekoBot.Modules.Gambling;
public readonly struct LuLaResult public readonly struct LuLaResult
{ {

View File

@@ -1,4 +1,4 @@
namespace Nadeko.Econ.Gambling; namespace NadekoBot.Modules.Gambling;
public sealed class LulaGame public sealed class LulaGame
{ {