Merge branch 'v4' into v5

src/NadekoBot/data/aliases.yml

@@ -664,8 +664,6 @@ avatar:
   - av
 hentai:
   - hentai
-nhentai:
-  - nhentai
 danbooru:
   - danbooru
 derpibooru:
@@ -807,6 +805,7 @@ hentaibomb:
   - hentaibomb
 cleverbot:
   - cleverbot
+  - chatgpt
 shorten:
   - shorten
 wikia:

src/NadekoBot/data/games.yml

@@ -1,5 +1,5 @@
 # DO NOT CHANGE
-version: 1
+version: 2
 # Hangman related settings (.hangman command)
 hangman:
 # The amount of currency awarded to the winner of a hangman game
@@ -8,8 +8,8 @@ hangman:
 trivia:
 # The amount of currency awarded to the winner of the trivia game.
   currencyReward: 0
-  # Users won't be able to start trivia games which have 
-# a smaller win requirement than the one specified by this setting.
+  # Users won't be able to start trivia games which have
+  # a smaller win requirement than the one specified by this setting.
   minimumWinReq: 1
 # List of responses for the .8ball command. A random one will be selected every time
 eightBallResponses:
@@ -54,3 +54,17 @@ raceAnimals:
     name: Crab
   - icon: "🦄"
     name: Unicorn
+# Which chatbot API should bot use.
+# 'cleverbot' - bot will use Cleverbot API.
+# 'gpt3' - bot will use GPT-3 API
+chatBot: gpt3
+
+chatGpt:
+  # Which GPT-3 Model should bot use.
+  # 'ada001' - cheapest and fastest
+  # 'babbage001' - 2nd option
+  # 'curie001' - 3rd option
+  # 'davinci003' - Most expensive, slowest
+  model: davinci003
+  # The maximum number of tokens to use per GPT-3 API call
+  maxTokens: 100

src/NadekoBot/data/searches.yml

@@ -18,7 +18,7 @@ imgSearchEngine: Google
 # - `ytdlp` - recommended easy, uses `yt-dlp`. Requires `yt-dlp` to be installed and it's path added to env variables
 # 
 # - `invidious` - recommended advanced, uses invidious api. Requires at least one invidious instance specified in the `invidiousInstances` property
-ytProvider: Ytdl
+ytProvider: Ytdlp
 # Set the searx instance urls in case you want to use 'searx' for either img or web search.
 # Nadeko will use a random one for each request.
 # Use a fully qualified url. Example: `https://my-searx-instance.mydomain.com`

src/NadekoBot/data/strings/commands/commands.en-US.yml

@@ -1117,11 +1117,6 @@ hentai:
   desc: "Shows a hentai image from a random website (gelbooru, danbooru, konachan or yandere) with a given tag. Tag(s) are optional but preferred. Maximum is usually 2 tags. Only 1 tag allowed."
   args:
     - "yuri"
-nhentai:
-  desc: "Shows basic information about a hentai with the specified id, or a valid nhentai search query."
-  args:
-    - "273426"
-    - "cute girl"
 autohentai:
   desc: "Posts a hentai every X seconds with a random tag from the provided tags. Use `|` to separate tag groups. Random group will be chosen every time the image is sent. Max 2 tags per group. 20 seconds minimum. Provide no parameters to disable."
   args:
@@ -1377,7 +1372,7 @@ listservers:
   args:
     - "3"
 cleverbot:
-  desc: "Toggles cleverbot session. When enabled, the bot will reply to messages starting with bot mention in the server. Expressions starting with %bot.mention% won't work if cleverbot is enabled."
+  desc: "Toggles cleverbot/chatgpt session. When enabled, the bot will reply to messages starting with bot mention in the server. Expressions starting with %bot.mention% won't work if cleverbot/chatgpt is enabled."
   args:
     - ""
 shorten: