Fixed embedbuilder withimageurl and withurl (thx ene)

.gitlab-ci.yml

@@ -91,7 +91,8 @@ upload-windows-updater-release:
     name: amazon/aws-cli
     entrypoint: [""]
   script:  
-    - sed -i "s/INSTALLER_FILE_NAME/$INSTALLER_FILE_NAME/g" releases-v3.json
+    - sed -i "s/_INSTALLER_FILE_NAME_/$INSTALLER_FILE_NAME/g" releases-v3.json
+    - sed -i "s/_VERSION_/$CI_COMMIT_TAG/g" releases-v3.json
     - aws --version
     - aws --endpoint-url $AWS_SERVICE_URL s3api put-object --bucket "$AWS_BUCKET_NAME" --key "dl/bot/$INSTALLER_FILE_NAME" --acl public-read --body "$INSTALLER_OUTPUT_DIR/$INSTALLER_FILE_NAME"
     - aws --endpoint-url $AWS_SERVICE_URL s3api put-object --bucket "$AWS_BUCKET_NAME" --key "dl/bot/releases-v3.json" --acl public-read --body "releases-v3.json"

docs/guides/migration-guide.md

@@ -3,6 +3,7 @@
 ## Windows
 
 1. Run your NadekoBot Updater first, and **make sure your bot is updated to at least 2.46.5**
+   - **Run your 2.46.5 Bot** and make sure it works, and then **stop it**
 2. Get the new NadekoBot v3 Updater [here](https://dl.nadeko.bot/v3)
 3. Click on the + icon to add a new bot
 4. Next to the path, click on the folder icon and select the folder where your 2.46.5 bot is

mkdocs-requirements.txt

@@ -1,5 +1,4 @@
-mkdocs-material==7.1.4
+mkdocs-material>=7.1.4
-mkdocs==1.1.2
+mkdocs>=1.1.2
-mkdocs-minify-plugin==0.4.0
+mkdocs-git-revision-date-localized-plugin>=0.9.2
-mkdocs-git-revision-date-localized-plugin==0.9.2
+mkdocs-material-extensions>=1.0.1
-mkdocs-material-extensions==1.0.1

mkdocs.yml

@@ -41,8 +41,6 @@ extra_css:
   - stylesheets/theme.css
 
 plugins:
-    - minify:
-        minify_html: true
     - git-revision-date-localized:
         type: date
     - search

releases-v3.json

@@ -1 +1 @@
-{ "VersionName":"$CI_COMMIT_TAG", "DownloadLink":"https://cdn.nadeko.bot/dl/bot/INSTALLER_FILE_NAME" }
+[{ "VersionName":"_VERSION_", "DownloadLink":"https://cdn.nadeko.bot/dl/bot/_INSTALLER_FILE_NAME_" }]

src/NadekoBot/Modules/Administration/Services/SelfService.cs

@@ -224,7 +224,7 @@ namespace NadekoBot.Modules.Administration.Services
 
             if (!ownerChannels.Any())
                 Log.Warning(
-                    "No owner channels created! Make sure you've specified the correct OwnerId in the credentials.json file and invited the bot to a Discord server.");
+                    "No owner channels created! Make sure you've specified the correct OwnerId in the creds.yml file and invited the bot to a Discord server.");
             else
                 Log.Information($"Created {ownerChannels.Count} out of {_creds.OwnerIds.Count} owner message channels.");
         }

src/NadekoBot/Services/IEmbedBuilderService.cs

@@ -55,10 +55,10 @@ namespace NadekoBot.Services
             => Wrap(_embed.WithAuthor(name, iconUrl, url));
 
         public IEmbedBuilder WithUrl(string url)
-            => Wrap(_embed.WithAuthor(url));
+            => Wrap(_embed.WithUrl(url));
 
         public IEmbedBuilder WithImageUrl(string url)
-            => Wrap(_embed.WithAuthor(url));
+            => Wrap(_embed.WithImageUrl(url));
 
         public IEmbedBuilder WithThumbnailUrl(string url)
             => Wrap(_embed.WithThumbnailUrl(url));

src/NadekoBot/Services/Impl/BotCredsProvider.cs

@@ -37,7 +37,7 @@ namespace NadekoBot.Services
                 
                 if (string.IsNullOrWhiteSpace(_creds.Token))
                 {
-                    Log.Error("Token is missing from credentials.json or Environment variables.\n" +
+                    Log.Error("Token is missing from creds.yml or Environment variables.\n" +
                               "Add it and restart the program.");
                     Helpers.ReadErrorAndExit(5);
                     return;

src/NadekoBot/Services/Impl/SingleProcessCoordinator.cs

@@ -23,7 +23,7 @@ namespace NadekoBot.Services
             if (string.IsNullOrWhiteSpace(_creds.RestartCommand?.Cmd)
                 || string.IsNullOrWhiteSpace(_creds.RestartCommand?.Args))
             {
-                Log.Error("You must set RestartCommand.Cmd and RestartCommand.Args in credentials.json");
+                Log.Error("You must set RestartCommand.Cmd and RestartCommand.Args in creds.yml");
                 return false;
             }
             

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

@@ -1152,7 +1152,7 @@ forwardmessages:
   args:
     - ""
 forwardtoall:
-  desc: "Toggles whether messages will be forwarded to all bot owners or only to the first one specified in the credentials.json file"
+  desc: "Toggles whether messages will be forwarded to all bot owners or only to the first one specified in the creds.yml file"
   args:
     - ""
 resetperms:

src/NadekoBot/data/strings/responses/responses.ar.json

@@ -807,7 +807,7 @@
   "feed_out_of_range": "مؤشر خارج النطاق.",
   "feed_removed": "تمت إزالة الخلاصة.",
   "feed_no_feed": "لم تشترك في أي خلاصات على هذا الشبكة.",
-  "restart_fail": "يجب إعداد RestartCommand في ملف credentials.json",
+  "restart_fail": "يجب إعداد RestartCommand في ملف creds.yml",
   "restarting": "إعادة تشغيل",
   "edit_fail": "",
   "streaming": "بث",

src/NadekoBot/data/strings/responses/responses.cs-CZ.json

@@ -807,7 +807,7 @@
   "feed_out_of_range": "Index mimo dosah.",
   "feed_removed": "Feed odebrán.",
   "feed_no_feed": "Neodebíráš žádný feed na tomto serveru.",
-  "restart_fail": "Musíš nastavit RestartCommand ve svém souboru credentials.json",
+  "restart_fail": "Musíš nastavit RestartCommand ve svém souboru creds.yml",
   "restarting": "Restartování.",
   "edit_fail": "Vlastní reakce s tímto ID neexistuje.",
   "streaming": "Streamování.",

src/NadekoBot/data/strings/responses/responses.de-DE.json

@@ -807,7 +807,7 @@
   "feed_out_of_range": "Index außer Reichweite.",
   "feed_removed": "Feed entfernt.",
   "feed_no_feed": "Du hast keine Feeds auf diesem Server abonniert.",
-  "restart_fail": "Du musst das RestartCommand in deinen credentials.json einrichten.",
+  "restart_fail": "Du musst das RestartCommand in deinen creds.yml einrichten.",
   "restarting": "Starte neu.",
   "edit_fail": "Benutzerdefinierte Reaktion mit dieser ID existiert nicht.",
   "streaming": "Streaming",

src/NadekoBot/data/strings/responses/responses.en-US.json

@@ -856,7 +856,7 @@
   "feed_out_of_range": "Index out of range.",
   "feed_removed": "Feed removed.",
   "feed_no_feed": "You haven't subscribed to any feeds on this server.",
-  "restart_fail": "You must setup RestartCommand in your credentials.json",
+  "restart_fail": "You must setup RestartCommand in your creds.yml",
   "restarting": "Restarting.",
   "edit_fail": "Custom reaction with that ID does not exist.",
   "streaming": "Streaming",

src/NadekoBot/data/strings/responses/responses.es-ES.json

@@ -807,7 +807,7 @@
   "feed_out_of_range": "Índice fuera de rango.",
   "feed_removed": "Contenido removido.",
   "feed_no_feed": "No se han suscrito a ningun contenido en este servidor.",
-  "restart_fail": "Debes configurar \u0060RestartCommand\u0060 en tu \u0060credentials.json\u0060",
+  "restart_fail": "Debes configurar \u0060RestartCommand\u0060 en tu \u0060creds.yml\u0060",
   "restarting": "Reiniciando.",
   "edit_fail": "El comando personalizado con esa ID no existe.",
   "streaming": "Transmitiendo",

src/NadekoBot/data/strings/responses/responses.hu-HU.json

@@ -807,7 +807,7 @@
   "feed_out_of_range": "Az index a tartományon kívül.",
   "feed_removed": "Hírcsatorna eltávolítva.",
   "feed_no_feed": "Nem iratkoztál fel egyetlen hírcsatornára sem ezen a szerveren.",
-  "restart_fail": "Be kell állítanod a RestartCommand parancsot a credentials.json fájlodban",
+  "restart_fail": "Be kell állítanod a RestartCommand parancsot a creds.yml fájlodban",
   "restarting": "Újraindítás.",
   "edit_fail": "Egyedi reakció azzal az azonosítóval nem létezik.",
   "streaming": "Közvetítés",

src/NadekoBot/data/strings/responses/responses.id-ID.json

@@ -807,7 +807,7 @@
   "feed_out_of_range": "Index di luar batas.",
   "feed_removed": "Feed dibuang",
   "feed_no_feed": "Anda belum melanggani feed apapun di server ini.",
-  "restart_fail": "Anda harus menyiapkan RestartCommand di credentials.json anda",
+  "restart_fail": "Anda harus menyiapkan RestartCommand di creds.yml anda",
   "restarting": "Memulai ulang.",
   "edit_fail": "Reaksi kustom dengan ID tersebut tidak ada.",
   "streaming": "Streaming",

src/NadekoBot/data/strings/responses/responses.it-IT.json

@@ -807,7 +807,7 @@
   "feed_out_of_range": "Indice fuori portata.",
   "feed_removed": "Feed rimosso.",
   "feed_no_feed": "Non sei iscritto a nessun feed di questo server.",
-  "restart_fail": "Devi impostate RestartCommand nel tuo credentials.json",
+  "restart_fail": "Devi impostate RestartCommand nel tuo creds.yml",
   "restarting": "Riavvio.",
   "edit_fail": "Non esiste una reazione personalizzata sotto questo ID.",
   "streaming": "Streaming",

src/NadekoBot/data/strings/responses/responses.ja-JP.json

@@ -807,7 +807,7 @@
   "feed_out_of_range": "",
   "feed_removed": "",
   "feed_no_feed": "",
-  "restart_fail": "Restartコマンドをcredentials.jsonで設定しなければなりません。",
+  "restart_fail": "Restartコマンドをcreds.ymlで設定しなければなりません。",
   "restarting": "再起動しています。",
   "edit_fail": "そのIDのカスタムリアクションは存在しません。",
   "streaming": "ストリーミング",

src/NadekoBot/data/strings/responses/responses.ko-KR.json

@@ -807,7 +807,7 @@
   "feed_out_of_range": "인덱스가 범위를 벗어났습니다.",
   "feed_removed": "피드가 제거되었습니다.",
   "feed_no_feed": "이 서버에 피드를 구독하지 않았습니다.",
-  "restart_fail": "당신은 credentials.json에 RestartCommand를 설정해야합니다.",
+  "restart_fail": "당신은 creds.yml에 RestartCommand를 설정해야합니다.",
   "restarting": "재시동 중.",
   "edit_fail": "요청하신 ID에 대한 커스텀 리액션을 찾지 못했습니다.",
   "streaming": "스트리밍",

src/NadekoBot/data/strings/responses/responses.nb-NO.json

@@ -807,7 +807,7 @@
   "feed_out_of_range": "Indeks utenfor rekkevidde.",
   "feed_removed": "Feed fjernet.",
   "feed_no_feed": "Du følger ingen feeds på denne serveren.",
-  "restart_fail": "Du må sette opp RestartCommand i credentials.json",
+  "restart_fail": "Du må sette opp RestartCommand i creds.yml",
   "restarting": "Starter på nytt.",
   "edit_fail": "Tilpasset reaksjon med den ID\u0027en eksisterer ikke.",
   "streaming": "Strømmer",

src/NadekoBot/data/strings/responses/responses.nl-NL.json

@@ -807,7 +807,7 @@
   "feed_out_of_range": "Index buiten bereik.",
   "feed_removed": "Feed verwijdert.",
   "feed_no_feed": "Je bent nog niet geabonneerd op een van de feeds van deze server.",
-  "restart_fail": "Je moet RestartCommand instellen in jouw credentials.json",
+  "restart_fail": "Je moet RestartCommand instellen in jouw creds.yml",
   "restarting": "Herstarten.",
   "edit_fail": "Aangepaste reactie met dat ID bestaat niet.",
   "streaming": "Streamen",

src/NadekoBot/data/strings/responses/responses.pt-BR.json

@@ -807,7 +807,7 @@
   "feed_out_of_range": "Índice fora de alcance.",
   "feed_removed": "Feed removido.",
   "feed_no_feed": "Você ainda não inscreveu um feed nesse servidor.",
-  "restart_fail": "Você precisa configurar o RestartCommand no arquivo credentials.json",
+  "restart_fail": "Você precisa configurar o RestartCommand no arquivo creds.yml",
   "restarting": "Reiniciando.",
   "edit_fail": "Não existe reação personalizada com essa ID.",
   "streaming": "Transmissão",

src/NadekoBot/data/strings/responses/responses.ro-RO.json

@@ -807,7 +807,7 @@
   "feed_out_of_range": "Index negăsit.",
   "feed_removed": "Feed eliminat.",
   "feed_no_feed": "Nu te-ai abonat la niciun feed pe acest server.",
-  "restart_fail": "Trebuie să instalezi RestartCommand in credentials.json",
+  "restart_fail": "Trebuie să instalezi RestartCommand in creds.yml",
   "restarting": "Se restartează.",
   "edit_fail": "Reacție personalizată cu acel ID nu există.",
   "streaming": "Transmițând flux live",

src/NadekoBot/data/strings/responses/responses.ru-RU.json

@@ -807,7 +807,7 @@
   "feed_out_of_range": "Указатель вышел за пределы диапазона.",
   "feed_removed": "Лента новостей удалена.",
   "feed_no_feed": "Вы еще не подписались ни на одну ленту новостей на этом сервере.",
-  "restart_fail": "Вы должны настроить RestartCommand в вашем файле credentials.json",
+  "restart_fail": "Вы должны настроить RestartCommand в вашем файле creds.yml",
   "restarting": "Перезапуск",
   "edit_fail": "Пользовательская реакция с этим ID не существует.",
   "streaming": "Транслирует",

src/NadekoBot/data/strings/responses/responses.tr-TR.json

@@ -807,7 +807,7 @@
   "feed_out_of_range": "Dizin aralık dışı.",
   "feed_removed": "Besleme kaldırıldı.",
   "feed_no_feed": "Bu sunucudaki herhangi bir yayına abone değilsiniz.",
-  "restart_fail": "RestartCommand\u0027ı, credentials.json dosyanıza kurmanız gerekir",
+  "restart_fail": "RestartCommand\u0027ı, creds.yml dosyanıza kurmanız gerekir",
   "restarting": "Yeniden Başlatılıyor.",
   "edit_fail": "Bu kimliği olan özel reaksiyon mevcut değil.",
   "streaming": "Yayın Akışı",

src/NadekoBot/data/strings/responses/responses.ts-TS.json

@@ -807,7 +807,7 @@
   "feed_out_of_range": "Index out of range.",
   "feed_removed": "Feed removed. I didn\u0027t care much for it anyways...",
   "feed_no_feed": "You gotta sub to some of our feeds we made on the server.",
-  "restart_fail": "You have to setup the RestartCommand in your credentials.json",
+  "restart_fail": "You have to setup the RestartCommand in your creds.yml",
   "restarting": "Restarting, or as i call it... taking a break from you.",
   "edit_fail": "So..that reaction with that ID?? Yea that doesn\u0027t exist. Believe it or not.",
   "streaming": "Streaming",

src/NadekoBot/data/strings/responses/responses.uk-UA.json

@@ -807,7 +807,7 @@
   "feed_out_of_range": "Індекс поза зоною досяжності.",
   "feed_removed": "Канал вилучений.",
   "feed_no_feed": "Ви не підписалися на будь-які канали на цьому сервері.",
-  "restart_fail": "Ви повинні налаштувати RestartCommand у вашому credentials.json",
+  "restart_fail": "Ви повинні налаштувати RestartCommand у вашому creds.yml",
   "restarting": "Перезапуск.",
   "edit_fail": "Користувацької реакції з цим ідентифікатором не існує.",
   "streaming": "Стрім",

src/NadekoBot/data/strings/responses/responses.zh-CN.json

@@ -807,7 +807,7 @@
   "feed_out_of_range": "索引在范围外。",
   "feed_removed": "已移除feed。",
   "feed_no_feed": "你尚未关注本服务器内的任何feed。",
-  "restart_fail": "你必须在credentials.json内设置RestartCommand",
+  "restart_fail": "你必须在creds.yml内设置RestartCommand",
   "restarting": "重启中。",
   "edit_fail": "与此ID关联的定制反应不存在。",
   "streaming": "直播",

src/NadekoBot/data/strings/responses/responses.zh-TW.json

@@ -807,7 +807,7 @@
   "feed_out_of_range": "超出範圍",
   "feed_removed": "RSS Feed已刪除。",
   "feed_no_feed": "您還沒有在此伺服器上訂閱任何RSS Feed。",
-  "restart_fail": "您必須要在您的credentials.json中設定RestartCommand。",
+  "restart_fail": "您必須要在您的creds.yml中設定RestartCommand。",
   "restarting": "重新啟動中。",
   "edit_fail": "該自訂回應ID不存在。",
   "streaming": "實況中",