diff --git a/.env b/.env index 752c207..081f0d6 100644 --- a/.env +++ b/.env @@ -52,7 +52,7 @@ MAINTENANCE_MODE=false DB_CONNECTION=sqlite #Mail Settings=LinkStack comes with a free to use built-in SMTP server for sending mail. You can leave this setting as is, if you wish to use this service please read our terms and conditions at llc-mail.tru.io. If you do not wish to use the built-in SMTP server, change the setting below. -#=MAIL_MAILER either smtp or built-in. Make sure to change this setting if you want to add a custom SMTP server. +#=MAIL_MAILER either smtp, sendmail or built-in. Make sure to change this setting if you want to add a custom SMTP server or use sendmail. MAIL_MAILER=built-in MAIL_HOST= MAIL_PORT= @@ -61,6 +61,8 @@ MAIL_PASSWORD= MAIL_ENCRYPTION= MAIL_FROM_ADDRESS= MAIL_FROM_NAME="${APP_NAME}" +#= Set the path to sendmail binary and set options. Default is /usr/sbin/sendmail -bs +MAIL_SENDMAIL= #Cache Settings=Completely optional. MEMCACHED_HOST=127.0.0.1 diff --git a/assets/linkstack/css/brands.css b/assets/linkstack/css/brands.css index 953b250..2a973bb 100644 --- a/assets/linkstack/css/brands.css +++ b/assets/linkstack/css/brands.css @@ -441,6 +441,23 @@ button:hover, filter: brightness(90%); } +/* Firefish */ +.button.button-firefish { + color: #fff; + background-image: linear-gradient( + 45deg, + #DB44DB, + 1%, + #EC476D, + 80%, + #F6AE4A + ); +} +.button.button-firefish:hover, +.button.button-firefish:focus { + filter: brightness(90%); +} + /* Firefox */ .button.button-firefox { color: #FFFFFF; diff --git a/assets/linkstack/icons/firefish.svg b/assets/linkstack/icons/firefish.svg new file mode 100644 index 0000000..cfaa654 --- /dev/null +++ b/assets/linkstack/icons/firefish.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/composer.lock b/composer.lock index 6d4708d..ba99a89 100644 --- a/composer.lock +++ b/composer.lock @@ -1874,24 +1874,24 @@ }, { "name": "jeroendesloovere/vcard", - "version": "v1.7.3", + "version": "v1.7.4", "source": { "type": "git", "url": "https://github.com/jeroendesloovere/vcard.git", - "reference": "2b8b6190c613d368b8cb6552e59cf6e6e7d0aea9" + "reference": "11a1cc62ffc2074838b138e9ae0790951004dd8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jeroendesloovere/vcard/zipball/2b8b6190c613d368b8cb6552e59cf6e6e7d0aea9", - "reference": "2b8b6190c613d368b8cb6552e59cf6e6e7d0aea9", + "url": "https://api.github.com/repos/jeroendesloovere/vcard/zipball/11a1cc62ffc2074838b138e9ae0790951004dd8e", + "reference": "11a1cc62ffc2074838b138e9ae0790951004dd8e", "shasum": "" }, "require": { "behat/transliterator": "~1.0", - "php": ">=5.3.3" + "php": ">=7.3.0" }, "require-dev": { - "phpunit/phpunit": "4.6.*" + "phpunit/phpunit": "^9.3" }, "type": "library", "autoload": { @@ -1921,9 +1921,9 @@ ], "support": { "issues": "https://github.com/jeroendesloovere/vcard/issues", - "source": "https://github.com/jeroendesloovere/vcard/tree/v1.7.3" + "source": "https://github.com/jeroendesloovere/vcard/tree/v1.7.4" }, - "time": "2021-11-24T20:21:20+00:00" + "time": "2023-09-07T19:46:46+00:00" }, { "name": "laravel/framework", @@ -8906,16 +8906,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.27", + "version": "9.2.28", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1" + "reference": "7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/b0a88255cb70d52653d80c890bd7f38740ea50d1", - "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef", + "reference": "7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef", "shasum": "" }, "require": { @@ -8972,7 +8972,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.27" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.28" }, "funding": [ { @@ -8980,7 +8980,7 @@ "type": "github" } ], - "time": "2023-07-26T13:44:30+00:00" + "time": "2023-09-12T14:36:20+00:00" }, { "name": "phpunit/php-file-iterator", @@ -9225,16 +9225,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.11", + "version": "9.6.12", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "810500e92855eba8a7a5319ae913be2da6f957b0" + "reference": "a122c2ebd469b751d774aa0f613dc0d67697653f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/810500e92855eba8a7a5319ae913be2da6f957b0", - "reference": "810500e92855eba8a7a5319ae913be2da6f957b0", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a122c2ebd469b751d774aa0f613dc0d67697653f", + "reference": "a122c2ebd469b751d774aa0f613dc0d67697653f", "shasum": "" }, "require": { @@ -9249,7 +9249,7 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.13", + "phpunit/php-code-coverage": "^9.2.28", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -9308,7 +9308,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.11" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.12" }, "funding": [ { @@ -9324,7 +9324,7 @@ "type": "tidelift" } ], - "time": "2023-08-19T07:10:56+00:00" + "time": "2023-09-12T14:39:31+00:00" }, { "name": "sebastian/cli-parser", diff --git a/config/button-names.php b/config/button-names.php index b6e10c3..e5ba283 100644 --- a/config/button-names.php +++ b/config/button-names.php @@ -12,6 +12,7 @@ $buttonNames = array( 'dev-to' => 'DEV', 'epic-games' => 'Epic Games', 'f-droid' => 'F-Droid', + 'firefish' => 'Firefish', 'furaffinity' => 'FurAffinity', 'github' => 'GitHub', 'gitlab' => 'GitLab', diff --git a/config/mail.php b/config/mail.php index bdd014e..074c767 100755 --- a/config/mail.php +++ b/config/mail.php @@ -34,6 +34,14 @@ return [ */ 'mailers' => [ + 'sendmail' => [ + 'transport' => 'sendmail', + 'path' => env('MAIL_SENDMAIL', '/usr/sbin/sendmail -bs'), + 'from' => [ + 'address' => env('MAIL_FROM_ADDRESS'), + 'name' => env('MAIL_FROM_NAME'), + ] + ], 'smtp' => [ 'transport' => 'smtp', 'host' => env('MAIL_HOST'), diff --git a/database/seeders/ButtonSeeder.php b/database/seeders/ButtonSeeder.php index b695f3c..3a4c61e 100755 --- a/database/seeders/ButtonSeeder.php +++ b/database/seeders/ButtonSeeder.php @@ -421,7 +421,7 @@ class ButtonSeeder extends Seeder [ 'name' => 'trakt' ], - + [ 'name' => 'last-fm' ], @@ -433,11 +433,14 @@ class ButtonSeeder extends Seeder [ 'name' => 'furaffinity' ], - + [ 'name' => 'bluesky' ], + [ + 'name' => 'firefish' + ], ]; Button::insert($buttons); diff --git a/resources/views/littlelink.blade.php b/resources/views/littlelink.blade.php index 897dd42..1717e0b 100644 --- a/resources/views/littlelink.blade.php +++ b/resources/views/littlelink.blade.php @@ -5,13 +5,18 @@ -{{-- Mastodon re="me" link --}} +{{-- Fediverse rel="me" links --}} +@php + $relMe = "mastodon, firefish"; + $relMeList = explode(', ', $relMe); +@endphp + @foreach($links as $link) - @if($link->name === "mastodon") + @if(in_array($link->name, $relMeList)) @endif @endforeach - + littlelink_description }}"> @@ -82,7 +87,7 @@ if($customBackgroundExists == true){ @endif @endif - + @@ -98,7 +103,7 @@ if($customBackgroundExists == true){ @else @endif - + @@ -119,7 +124,7 @@ if($customBackgroundExists == true){ {{-- --}} - @include('layouts.fonts') + @include('layouts.fonts') @if(file_exists(base_path("assets/linkstack/images/").findFile('favicon'))) @@ -265,7 +270,7 @@ if($customBackgroundExists == true){

@if(env('ALLOW_USER_HTML') === true){!! $info->littlelink_description !!}@else{{ $info->littlelink_description }}@endif

- + @php $icons = DB::table('links')->where('user_id', $userinfo->id)->where('button_id', 94)->get(); @endphp @if(count($icons) > 0) @@ -276,7 +281,7 @@ if($customBackgroundExists == true){ @endif - @endforeach + @endforeach @php $initial = 1; @endphp @@ -296,6 +301,9 @@ if($customBackgroundExists == true){ @case('buy me a coffee')
link }}" @if(theme('open_links_in_same_tab') != "true")target="_blank"@endif >{{ $link->name }}Buy me a Coffee
@break + @case('firefish') +
link }}" @if(theme('open_links_in_same_tab') != "true")target="_blank"@endif >{{ $link->name }}{{ $link->title }}
+ @break @case('mastodon')
link }}" @if(theme('open_links_in_same_tab') != "true")target="_blank"@endif >{{ $link->name }}{{ $link->title }}
@break @@ -334,7 +342,7 @@ if($customBackgroundExists == true){ @endforeach @include('layouts.footer') - + @@ -342,4 +350,4 @@ if($customBackgroundExists == true){ @if(theme('enable_custom_code') == "true" and theme('enable_custom_body_end') == "true" and env('ALLOW_CUSTOM_CODE_IN_THEMES') == 'true')@include($GLOBALS['themeName'] . '.extra.custom-body-end')@endif - \ No newline at end of file +