- Fixed .logevents and .log bugs related to thread logging

- Upped version to 4.3.16 - closes #418
2025-09-10 17:28:27 -04:00 · 2023-05-24 10:31:05 +02:00
9 changed files with 21 additions and 82 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,16 +14,8 @@ variables:
  tests: "NadekoBot.Tests"
  LINUX_X64_OUTPUT_DIR: "nadekobot-linux-x64"
  LINUX_X64_RELEASE: "$CI_COMMIT_TAG-linux-x64-build.tar"
-  LINUX_ARM64_OUTPUT_DIR: "nadekobot-linux-arm64"
-  LINUX_ARM64_RELEASE: "$CI_COMMIT_TAG-linux-arm64-build.tar"
-  MACOS_X64_OUTPUT_DIR: "nadekobot-osx-x64"
-  MACOS_X64_RELEASE: "$CI_COMMIT_TAG-osx-x64-build.tar"
-  MACOS_ARM64_OUTPUT_DIR: "nadekobot-osx-arm64"
-  MACOS_ARM64_RELEASE: "$CI_COMMIT_TAG-osx-arm64-build.tar"
  WIN_X64_OUTPUT_DIR: "nadekobot-windows-x64"
  WIN_X64_RELEASE: "$CI_COMMIT_TAG-windows-x64-build.zip"
-  WIN_ARM64_OUTPUT_DIR: "nadekobot-windows-arm64"
-  WIN_ARM64_RELEASE: "$CI_COMMIT_TAG-windows-arm64-build.zip"
  PACKAGE_REGISTRY_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/NadekoBot-build/${CI_COMMIT_TAG}"
  INSTALLER_OUTPUT_DIR: "nadeko-installers/${CI_COMMIT_TAG}"
  INSTALLER_FILE_NAME: "nadeko-setup-${CI_COMMIT_TAG}.exe"
@@ -32,19 +24,11 @@ build:
  stage: build
  script:
    - "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 -o $LINUX_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
    - "dotnet publish -c Release -r win7-x64 --self-contained -o $WIN_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
-    - "dotnet publish -c Release -r win7-arm64 --self-contained -o $WIN_ARM64_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 -o $MACOS_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
  artifacts:
    paths:
      - "$LINUX_X64_OUTPUT_DIR/"
-      - "$LINUX_ARM64_OUTPUT_DIR/"
      - "$WIN_X64_OUTPUT_DIR/"
-      - "$WIN_ARM64_OUTPUT_DIR/"
-      - "$MACOS_X64_OUTPUT_DIR/"
-      - "$MACOS_ARM64_OUTPUT_DIR/"

 upload-builds:
  stage: upload-builds
@@ -54,23 +38,12 @@ upload-builds:
  script:
    - apk add --no-cache curl tar zip
    - "tar cvf $LINUX_X64_RELEASE $LINUX_X64_OUTPUT_DIR/*"
-    - "tar cvf $LINUX_ARM64_RELEASE $LINUX_ARM64_OUTPUT_DIR/*"
-    - "tar cvf $MACOS_X64_RELEASE $MACOS_X64_OUTPUT_DIR/*"
-    - "tar cvf $MACOS_ARM64_RELEASE $MACOS_ARM64_OUTPUT_DIR/*"
    - "zip -r $WIN_X64_RELEASE $WIN_X64_OUTPUT_DIR/*"
-    - "zip -r $WIN_ARM64_RELEASE $WIN_ARM64_OUTPUT_DIR/*"
    - |
      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $LINUX_X64_RELEASE $PACKAGE_REGISTRY_URL/$LINUX_X64_RELEASE
-    - |
-      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $LINUX_ARM64_RELEASE $PACKAGE_REGISTRY_URL/$LINUX_ARM64_RELEASE
    - |
      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $WIN_X64_RELEASE $PACKAGE_REGISTRY_URL/$WIN_X64_RELEASE
-    - |
-      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $WIN_ARM64_RELEASE $PACKAGE_REGISTRY_URL/$WIN_ARM64_RELEASE
-    - |
-      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $MACOS_X64_RELEASE $PACKAGE_REGISTRY_URL/$MACOS_X64_RELEASE
-    - |
-      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $MACOS_ARM64_RELEASE $PACKAGE_REGISTRY_URL/$MACOS_ARM64_RELEASE
+
 release:
  stage: release
  image: registry.gitlab.com/gitlab-org/release-cli:latest
@@ -80,11 +53,7 @@ release:
    - |
      release-cli create --name "NadekoBot v$CI_COMMIT_TAG" --description "## [Changelog](https://gitlab.com/Kwoth/nadekobot/-/blob/v4/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_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_ARM64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WIN_ARM64_RELEASE}\"}" \
-        --assets-link "{\"name\":\"${MACOS_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${MACOS_X64_RELEASE}\"}" \
-        --assets-link "{\"name\":\"${MACOS_ARM64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${MACOS_ARM64_RELEASE}\"}"
+        --assets-link "{\"name\":\"${WIN_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WIN_X64_RELEASE}\"}"

 test:
  stage: test
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,14 +2,6 @@

 Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o

-## [4.3.17] - 06.09.2023
-
-### Fixed 
-
- Fix to waifu gifts being character limited
- Fixes UserUpdated and UserPresence not correctly ignoring users that are logignored
- Added Trim() to activity names since apparently some activities have trailing spaces.
-
 ## [4.3.16] - 24.05.2023

 ### Fixed
--- a/7
+++ b/7
@@ -28,11 +28,12 @@ WORKDIR /app
 RUN set -xe; \
    useradd -m nadeko; \
    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 python3-pip sudo; \
    update-alternatives --install /usr/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; \
-    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; \
+    pip3 install --no-cache-dir --upgrade youtube-dl; \
+    apt-get purge -y python3-pip; \
+    chmod +x /usr/local/bin/youtube-dl; \
    apt-get autoremove -y; \
    apt-get autoclean -y

--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,23 +0,0 @@
-version: "3.7"
-
-services:
-  nadeko:
-    image: insert-image-name-here:latest
-    depends_on:
-      - redis
-    environment:
-      TZ: Europe/Paris
-      NadekoBot_RedisOptions: redis,name=nadeko
-      #NadekoBot_ShardRunCommand: dotnet
-      #NadekoBot_ShardRunArguments: /app/NadekoBot.dll {0} {1}
-    volumes:
-      - /srv/nadeko/conf:/app/conf:ro
-      - /srv/nadeko/data:/app/data
-
-  redis:
-    image: redis:4-alpine
-    sysctls:
-      - net.core.somaxconn=511
-    command: redis-server --maxmemory 32M --maxmemory-policy volatile-lru
-    volumes:
-      - /srv/nadeko/redis-data:/data
--- a/docs/placeholders.md
+++ b/docs/placeholders.md
@@ -68,6 +68,11 @@ Some features have their own specific placeholders which are noted in that featu
 - `%ban.reason%` - Reason for the ban, if provided  
 - `%ban.duration%` - Duration of the ban in the form Days.Hours:Minutes (6.05:04)  

+### Bot stats placeholders
+
+- `%servers%` - Server count bot has joined
+- `%users%` - Combined user count on servers the bot has joined
+
 ### Shard stats placeholders

 - `%shard.servercount%` - Server count on current shard
--- a/src/NadekoBot/Modules/Administration/ServerLog/ServerLogCommandService.cs
+++ b/src/NadekoBot/Modules/Administration/ServerLog/ServerLogCommandService.cs
@@ -98,8 +98,7 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor

        if (!GuildLogSettings.TryGetValue(gu.Guild.Id, out var logSetting)
            || before is null
-            || after is null
-            || logSetting.LogIgnores.Any(ilc => ilc.LogItemId == gu.Id && ilc.ItemType == IgnoredItemType.User))
+            || after is null)
            return;

        ITextChannel? logChannel;
@@ -351,7 +350,7 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor

                var g = after.Guild;

-                if (!GuildLogSettings.TryGetValue(g.Id, out var logSetting) || logSetting.UserUpdatedId is null || logSetting.LogIgnores.Any(ilc => ilc.LogItemId == after.Id && ilc.ItemType == IgnoredItemType.User))
+                if (!GuildLogSettings.TryGetValue(g.Id, out var logSetting) || logSetting.UserUpdatedId is null)
                    return;

                ITextChannel? logChannel;
--- a/src/NadekoBot/Modules/Gambling/Waifus/WaifuClaimCommands.cs
+++ b/src/NadekoBot/Modules/Gambling/Waifus/WaifuClaimCommands.cs
@@ -250,9 +250,8 @@ public partial class Gambling
                ? "-"
                : string.Join("\n",
                    itemList.Where(x => waifuItems.TryGetValue(x.ItemEmoji, out _))
-                        .OrderByDescending(x => waifuItems[x.ItemEmoji].Price)
+                        .OrderBy(x => waifuItems[x.ItemEmoji].Price)
                        .GroupBy(x => x.ItemEmoji)
-                        .Take(60)
                        .Select(x => $"{x.Key} x{x.Count(),-3}")
                        .Chunk(2)
                        .Select(x => string.Join(" ", x)));
@@ -265,10 +264,7 @@ public partial class Gambling

            var fansList = await _service.GetFansNames(wi.WaifuId);
            var fansStr = fansList
-                .Shuffle()
-                .Take(30)
-                .Select((x) => claimsNames.Contains(x) ? $"{x} 💞" : x)
-                .Join('\n');
+                .Select((x) => claimsNames.Contains(x) ? $"{x} 💞" : x).Join('\n');

            
            if (string.IsNullOrWhiteSpace(fansStr))
--- a/src/NadekoBot/Modules/Utility/Utility.cs
+++ b/src/NadekoBot/Modules/Utility/Utility.cs
@@ -94,7 +94,7 @@ public partial class Utility : NadekoModule

        var rng = new NadekoRandom();
        var arr = await Task.Run(() => socketGuild.Users
-                                                  .Where(u => u.Activities.FirstOrDefault()?.Name?.Trim().ToUpperInvariant()
+                                                  .Where(u => u.Activities.FirstOrDefault()?.Name?.ToUpperInvariant()
                                                              == game)
                                                  .Select(u => u.Username)
                                                  .OrderBy(_ => rng.Next())
--- a/src/NadekoBot/Services/Impl/StatsService.cs
+++ b/src/NadekoBot/Services/Impl/StatsService.cs
@@ -7,7 +7,7 @@ namespace NadekoBot.Services;

 public sealed class StatsService : IStatsService, IReadyExecutor, INService
 {
-    public const string BOT_VERSION = "4.3.17";
+    public const string BOT_VERSION = "4.3.16";

    public string Author
        => "Kwoth#2452";