Auto commit for release 'develop' on 2024-12-31

.github/workflows/release.yml

@@ -168,7 +168,7 @@ jobs:
 
           # if this is a develop build, slightly different variable names.
           if [[ "develop" == "$version" ]]; then
-            [[ -z $(git status --untracked-files=normal --porcelain) ]] && echo "this branch is clean, no need to push..." && exit 0;
+            #[[ -z $(git status --untracked-files=normal --porcelain) ]] && echo "this branch is clean, no need to push..." && exit 0;
             releaseName=$version-$(date +'%Y%m%d')
             originalName=$releaseName
             zipName=FireflyIII-develop.zip
@@ -177,7 +177,7 @@ jobs:
 
           # if this is a branch build, also slightly different variable names.
           if [[ "$version" == branch* ]]; then
-            [[ -z $(git status --untracked-files=normal --porcelain) ]] && echo "this branch is clean, no need to push..." && exit 0;
+            #[[ -z $(git status --untracked-files=normal --porcelain) ]] && echo "this branch is clean, no need to push..." && exit 0;
             # branch builds overrule develop
             releaseName=$version-$(date +'%Y%m%d')
             originalName=$releaseName
@@ -229,7 +229,7 @@ jobs:
           # describe the development release.
           if [[ "develop" == "$version" ]]; then
             echo 'Develop release.'
-            rm output.txt
+            rm -f output.txt
             touch output.txt
             sudo chown -R runner:docker output.txt
             echo "Weekly development release of Firefly III with the latest fixes, translations and features. Docker users can find this release under the \`develop\` tag." >> output.txt
@@ -244,7 +244,7 @@ jobs:
           # describe a branch release
           if [[ "$version" == branch* ]]; then
             echo 'Branch release.'
-            rm output.txt
+            rm -f output.txt
             touch output.txt
             sudo chown -R runner:docker output.txt
             echo "Irregular BRANCH release of Firefly III. This release contains specific features or changes. Docker users can find this release under the \`$version\` tag." >> output.txt
@@ -257,9 +257,45 @@ jobs:
             echo ":warning: Please be careful with this branch pre-release, as it may not work as expected." >> output.txt
           fi
           # describe the main release
-          if [[ "develop" != "$version" ]] && [[ "$version" != branch* ]]; then
-            sudo chown -R runner:docker output.txt
+          if [[ "develop" != "$version" ]] && [[ "$version" != branch* ]] && [[ "$version" != *alpha* ]] && [[ "$version" != *beta* ]]; then
             echo 'Main release.'
+            sudo chown -R runner:docker output.txt
+            echo '' >> output.txt
+            echo '### Instructions' >> output.txt
+            echo '' >> output.txt
+            echo "* Installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
+            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
+            echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
+
+          fi
+
+          # describe alpha release
+          if [[ "$version" == *alpha* ]]; then
+            echo 'ALPHA release.'
+            rm -f output.txt
+            touch output.txt
+            sudo chown -R runner:docker output.txt
+            echo "Very early ALPHA release of Firefly III. This release contains specific features or changes. Docker users can find this release under the \`$version\` tag." >> output.txt
+            echo '' >> output.txt
+            echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
+            echo '' >> output.txt
+            echo '### Instructions' >> output.txt
+            echo '' >> output.txt
+            echo "* Installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
+            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
+            echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
+
+          fi
+
+          # describe beta release
+          if [[ "$version" == *beta* ]]; then
+            echo 'BETA release.'
+            rm -f output.txt
+            touch output.txt
+            sudo chown -R runner:docker output.txt
+            echo "Very early BETA release of Firefly III. This release contains specific features or changes. Docker users can find this release under the \`$version\` tag." >> output.txt
+            echo '' >> output.txt
+            echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
             echo '' >> output.txt
             echo '### Instructions' >> output.txt
             echo '' >> output.txt
@@ -336,12 +372,12 @@ jobs:
             gh release upload $releaseName HEAD.txt
 
             # remove all temporary files
-            rm output.txt
-            rm HEAD.txt
-            rm $zipName
-            rm $zipName.sha256
-            rm $tarName
-            rm $tarName.sha256
+            rm -f output.txt
+            rm -f HEAD.txt
+            rm -f $zipName
+            rm -f $zipName.sha256
+            rm -f $tarName
+            rm -f $tarName.sha256
 
             # merge main back into develop
             git checkout develop

app/Api/V2/Request/Chart/ChartRequest.php

@@ -25,7 +25,6 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V2\Request\Chart;
 
 use FireflyIII\Enums\UserRoleEnum;
-use FireflyIII\Support\Http\Api\ParsesQueryFilters;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
@@ -40,7 +39,6 @@ class ChartRequest extends FormRequest
 {
     use ChecksLogin;
     use ConvertsDataTypes;
-    use ParsesQueryFilters;
     use ValidatesUserGroupTrait;
 
     protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];

app/Http/Controllers/Chart/AccountController.php

@@ -137,13 +137,13 @@ class AccountController extends Controller
 
                     continue;
                 }
-                Log::debug(sprintf('Will process expense array "%s" with amount %s', $key, $endBalance));
+                // Log::debug(sprintf('Will process expense array "%s" with amount %s', $key, $endBalance));
                 $searchCode   = $this->convertToNative ? $this->defaultCurrency->code : $key;
-                Log::debug(sprintf('Search code is %s', $searchCode));
+                // Log::debug(sprintf('Search code is %s', $searchCode));
                 // see if there is an accompanying start amount.
                 // grab the difference and find the currency.
                 $startBalance = ($startBalances[$account->id][$key] ?? '0');
-                Log::debug(sprintf('Start balance is %s', $startBalance));
+                //                Log::debug(sprintf('Start balance is %s', $startBalance));
                 $diff         = bcsub($endBalance, $startBalance);
                 $currencies[$searchCode] ??= $this->currencyRepository->findByCode($searchCode);
                 if (0 !== bccomp($diff, '0')) {
@@ -596,13 +596,13 @@ class AccountController extends Controller
 
                     continue;
                 }
-                Log::debug(sprintf('Will process expense array "%s" with amount %s', $key, $endBalance));
+                // Log::debug(sprintf('Will process expense array "%s" with amount %s', $key, $endBalance));
                 $searchCode   = $this->convertToNative ? $this->defaultCurrency->code : $key;
-                Log::debug(sprintf('Search code is %s', $searchCode));
+                // Log::debug(sprintf('Search code is %s', $searchCode));
                 // see if there is an accompanying start amount.
                 // grab the difference and find the currency.
                 $startBalance = ($startBalances[$account->id][$key] ?? '0');
-                Log::debug(sprintf('Start balance is %s', $startBalance));
+                // Log::debug(sprintf('Start balance is %s', $startBalance));
                 $diff         = bcsub($endBalance, $startBalance);
                 $currencies[$searchCode] ??= $this->currencyRepository->findByCode($searchCode);
                 if (0 !== bccomp($diff, '0')) {

app/Http/Controllers/System/InstallController.php

@@ -62,8 +62,6 @@ class InstallController extends Controller
             'migrate'                            => ['--seed' => true, '--force' => true],
             'generate-keys'                      => [], // an exception :(
             'firefly-iii:upgrade-database'       => [],
-            // 'firefly-iii:correct-database'       => [],
-            // 'firefly-iii:report-integrity'       => [],
             'firefly-iii:set-latest-version'     => ['--james-is-cool' => true],
             'firefly-iii:verify-security-alerts' => [],
         ];

app/Notifications/ReturnsAvailableChannels.php

@@ -83,15 +83,17 @@ class ReturnsAvailableChannels
 
     private static function returnUserChannels(User $user): array
     {
+        Log::debug(sprintf('Checking channels for user #%d', $user->id));
         $channels          = ['mail'];
-        $slackUrl          = app('preferences')->getEncryptedForUser($user, 'slack_webhook_url', '')->data;
+        $slackUrl          = (string) app('preferences')->getEncryptedForUser($user, 'slack_webhook_url', '')->data;
         if (UrlValidator::isValidWebhookURL($slackUrl)) {
             $channels[] = 'slack';
         }
 
         // validate presence of of Ntfy settings.
-        if ('' !== (string) app('preferences')->getEncryptedForUser($user, 'ntfy_topic', '')->data) {
-            Log::debug('Enabled ntfy.');
+        $ntfyTopic         = (string) app('preferences')->getEncryptedForUser($user, 'ntfy_topic', '')->data;
+        if ('' !== $ntfyTopic) {
+            Log::debug(sprintf('Enabled ntfy, "%s"', $ntfyTopic));
             $channels[] = NtfyChannel::class;
         }
         if ('' === (string) app('preferences')->getEncryptedForUser($user, 'ntfy_topic', '')->data) {

app/Repositories/Bill/BillRepository.php

@@ -550,9 +550,9 @@ class BillRepository implements BillRepositoryInterface
             foreach ($set as $transactionJournal) {
                 $setAmount = bcadd($setAmount, Amount::getAmountFromJournalObject($transactionJournal));
             }
-            Log::debug(sprintf('Bill #%d ("%s") with %d transaction(s) and sum %s %s', $bill->id, $bill->name, $set->count(), $currency->code, $setAmount));
+            // Log::debug(sprintf('Bill #%d ("%s") with %d transaction(s) and sum %s %s', $bill->id, $bill->name, $set->count(), $currency->code, $setAmount));
             $return[$currency->id]['sum'] = bcadd($return[$currency->id]['sum'], $setAmount);
-            Log::debug(sprintf('Total sum is now %s', $return[$currency->id]['sum']));
+            // Log::debug(sprintf('Total sum is now %s', $return[$currency->id]['sum']));
         }
 
         return $return;
@@ -586,7 +586,7 @@ class BillRepository implements BillRepositoryInterface
 
             $minField = $convertToNative && $bill->transactionCurrency->id !== $default->id ? 'native_amount_min' : 'amount_min';
             $maxField = $convertToNative && $bill->transactionCurrency->id !== $default->id ? 'native_amount_max' : 'amount_max';
-            Log::debug(sprintf('min field is %s, max field is %s', $minField, $maxField));
+            // Log::debug(sprintf('min field is %s, max field is %s', $minField, $maxField));
 
             if ($total > 0) {
                 $currency                     = $convertToNative && $bill->transactionCurrency->id !== $default->id ? $default : $bill->transactionCurrency;

app/Repositories/Budget/AvailableBudgetRepository.php

@@ -133,8 +133,8 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
         Log::debug(sprintf('Now in %s(%s, %s)', __METHOD__, $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
         $return           = [];
         $availableBudgets = $this->user->availableBudgets()
-            ->where('start_date', $start->format('Y-m-d H:i:s'))
-            ->where('end_date', $end->format('Y-m-d H:i:s'))->get()
+            ->where('start_date', $start->format('Y-m-d'))
+            ->where('end_date', $end->format('Y-m-d'))->get()
         ;
 
         Log::debug(sprintf('Found %d available budgets', $availableBudgets->count()));

app/Repositories/PiggyBank/PiggyBankRepository.php

@@ -287,7 +287,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
             $amount = '' === $amount ? '0' : $amount;
             $sum    = bcadd($sum, $amount);
         }
-        Log::debug(sprintf('Current amount in piggy bank #%d ("%s") is %s', $piggyBank->id, $piggyBank->name, $sum));
+        // Log::debug(sprintf('Current amount in piggy bank #%d ("%s") is %s', $piggyBank->id, $piggyBank->name, $sum));
 
         return $sum;
     }

app/Support/Preferences.php

@@ -210,6 +210,10 @@ class Preferences
         try {
             $result->data = decrypt($result->data);
         } catch (DecryptException $e) {
+            if ('The MAC is invalid.' === $e->getMessage()) {
+                Log::debug('Set data to NULL');
+                $result->data = null;
+            }
             Log::error(sprintf('Could not decrypt preference "%s": %s', $name, $e->getMessage()));
 
             return $result;
@@ -230,6 +234,10 @@ class Preferences
         try {
             $result->data = decrypt($result->data);
         } catch (DecryptException $e) {
+            if ('The MAC is invalid.' === $e->getMessage()) {
+                Log::debug('Set data to NULL');
+                $result->data = null;
+            }
             Log::error(sprintf('Could not decrypt preference "%s": %s', $name, $e->getMessage()));
 
             return $result;

app/Support/Steam.php

@@ -331,7 +331,7 @@ class Steam
             if ($native->id === $accountCurrency?->id) {
                 $return['balance'] = bcadd('' === (string) $account->virtual_balance ? '0' : $account->virtual_balance, $return['balance']);
             }
-            Log::debug(sprintf('balance is (%s only) %s (with virtual balance)', $native->code, $this->bcround($return['balance'], 2)));
+            // Log::debug(sprintf('balance is (%s only) %s (with virtual balance)', $native->code, $this->bcround($return['balance'], 2)));
 
             // native balance
             $return['native_balance'] = (string) $account->transactions()
@@ -342,7 +342,7 @@ class Steam
             ;
             // plus native virtual balance.
             $return['native_balance'] = bcadd('' === (string) $account->native_virtual_balance ? '0' : $account->native_virtual_balance, $return['native_balance']);
-            Log::debug(sprintf('native_balance is (all transactions to %s) %s (with virtual balance)', $native->code, $this->bcround($return['native_balance'])));
+            // Log::debug(sprintf('native_balance is (all transactions to %s) %s (with virtual balance)', $native->code, $this->bcround($return['native_balance'])));
 
             // plus foreign transactions in THIS currency.
             $sum                      = (string) $account->transactions()
@@ -354,7 +354,7 @@ class Steam
             ;
             $return['native_balance'] = bcadd($return['native_balance'], $sum);
 
-            Log::debug(sprintf('Foreign amount transactions add (%s only) %s, total native_balance is now %s', $native->code, $this->bcround($sum), $this->bcround($return['native_balance'])));
+            // Log::debug(sprintf('Foreign amount transactions add (%s only) %s, total native_balance is now %s', $native->code, $this->bcround($sum), $this->bcround($return['native_balance'])));
         }
 
         // balance(s) in other (all) currencies.
@@ -365,12 +365,12 @@ class Steam
             ->get(['transaction_currencies.code', 'transactions.amount'])->toArray()
         ;
         $others          = $this->groupAndSumTransactions($array, 'code', 'amount');
-        Log::debug('All balances are (joined)', $others);
+        // Log::debug('All balances are (joined)', $others);
         // if the account has no own currency preference, drop balance in favor of native balance
         if ($hasCurrency && !$convertToNative) {
             $return['balance']        = $others[$currency->code] ?? '0';
             $return['native_balance'] = $others[$currency->code] ?? '0';
-            Log::debug(sprintf('Set balance + native_balance to %s', $return['balance']));
+            // Log::debug(sprintf('Set balance + native_balance to %s', $return['balance']));
         }
 
         // if the currency is the same as the native currency, set the native_balance to the balance for consistency.
@@ -379,16 +379,15 @@ class Steam
         //        }
 
         if (!$hasCurrency && array_key_exists('balance', $return) && array_key_exists('native_balance', $return)) {
-            Log::debug('Account has no currency preference, dropping balance in favor of native balance.');
+            //            Log::debug('Account has no currency preference, dropping balance in favor of native balance.');
             $sum                      = bcadd($return['balance'], $return['native_balance']);
-            Log::debug(sprintf('%s + %s = %s', $return['balance'], $return['native_balance'], $sum));
+            //            Log::debug(sprintf('%s + %s = %s', $return['balance'], $return['native_balance'], $sum));
             $return['native_balance'] = $sum;
             unset($return['balance']);
         }
-        $final           = array_merge($return, $others);
-        Log::debug('Return is', $final);
 
-        return $final;
+        return array_merge($return, $others);
+        // Log::debug('Return is', $final);
     }
 
     public function filterAccountBalances(array $total, Account $account, bool $convertToNative, ?TransactionCurrency $currency = null): array

config/firefly.php

@@ -81,7 +81,7 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2024-12-30',
+    'version'                      => 'develop/2024-12-31',
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 25,
 

package-lock.json

@@ -12114,9 +12114,9 @@
             "license": "ISC"
         },
         "node_modules/yaml": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.1.tgz",
-            "integrity": "sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==",
+            "version": "2.7.0",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz",
+            "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==",
             "dev": true,
             "license": "ISC",
             "bin": {