diff --git a/app/Database/Seeds/PlatformSeeder.php b/app/Database/Seeds/PlatformSeeder.php index 9c3fc960..dbfcd2e2 100644 --- a/app/Database/Seeds/PlatformSeeder.php +++ b/app/Database/Seeds/PlatformSeeder.php @@ -18,7 +18,7 @@ class PlatformSeeder extends Seeder { public function run(): void { - $data = [ + $podcastingData = [ [ 'slug' => 'amazon', 'type' => 'podcasting', @@ -403,6 +403,9 @@ class PlatformSeeder extends Seeder 'home_url' => 'https://getzion.com/', 'submit_url' => 'https://shop.n2n2.chat/', ], + ]; + + $fundingData = [ [ 'slug' => 'paypal', 'type' => 'funding', @@ -410,6 +413,13 @@ class PlatformSeeder extends Seeder 'home_url' => 'https://www.paypal.com/', 'submit_url' => 'https://www.paypal.com/paypalme/my/grab', ], + [ + 'slug' => 'fosspay', + 'type' => 'funding', + 'label' => 'fosspay', + 'home_url' => 'https://git.sr.ht/~sircmpwn/fosspay', + 'submit_url' => '', + ], [ 'slug' => 'gofundme', 'type' => 'funding', @@ -474,6 +484,9 @@ class PlatformSeeder extends Seeder 'home_url' => 'https://www.ulule.com/', 'submit_url' => 'https://www.ulule.com/projects/create/#/', ], + ]; + + $socialData = [ [ 'slug' => 'discord', 'type' => 'social', @@ -518,6 +531,13 @@ class PlatformSeeder extends Seeder 'home_url' => 'https://joinmastodon.org/', 'submit_url' => 'https://joinmastodon.org/communities', ], + [ + 'slug' => 'misskey', + 'type' => 'social', + 'label' => 'Misskey', + 'home_url' => 'https://join.misskey.page/', + 'submit_url' => 'https://join.misskey.page/en-US/instances', + ], [ 'slug' => 'mobilizon', 'type' => 'social', @@ -539,6 +559,13 @@ class PlatformSeeder extends Seeder 'home_url' => 'https://pixelfed.org/', 'submit_url' => 'https://beta.joinpixelfed.org/', ], + [ + 'slug' => 'pleroma', + 'type' => 'social', + 'label' => 'Pleroma', + 'home_url' => 'https://pleroma.social/', + 'submit_url' => 'https://pleroma.social/#featured-instances', + ], [ 'slug' => 'plume', 'type' => 'social', @@ -583,6 +610,7 @@ class PlatformSeeder extends Seeder ], ]; + $data = array_merge($podcastingData, $fundingData, $socialData); $this->db ->table('platforms') ->ignore(true) diff --git a/app/Helpers/svg_helper.php b/app/Helpers/svg_helper.php index e65f28d4..64d4ea4e 100644 --- a/app/Helpers/svg_helper.php +++ b/app/Helpers/svg_helper.php @@ -14,11 +14,25 @@ if (! function_exists('icon')) { * * @param string $name name of the icon file without the .svg extension * @param string $class to be added to the svg string + * @param 'social'|'podcasting'|'funding' $type type of icon to be added * @return string svg contents */ - function icon(string $name, string $class = ''): string + function icon(string $name, string $class = '', string $type = null): string { - $svgContents = file_get_contents('assets/icons/' . $name . '.svg'); + if ($type !== null) { + $name = $type . '/' . $name; + } + + try { + $svgContents = file_get_contents('assets/icons/' . $name . '.svg'); + } catch (Exception) { + if ($type !== null) { + return icon('default', $class, $type); + } + + return '□'; + } + if ($class !== '') { $svgContents = str_replace(' + + + \ No newline at end of file diff --git a/app/Resources/icons/funding/gofundme.svg b/app/Resources/icons/funding/gofundme.svg index 8573eaa3..976e231a 100755 --- a/app/Resources/icons/funding/gofundme.svg +++ b/app/Resources/icons/funding/gofundme.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/funding/helloasso.svg b/app/Resources/icons/funding/helloasso.svg index a16faf73..e32d9a3f 100755 --- a/app/Resources/icons/funding/helloasso.svg +++ b/app/Resources/icons/funding/helloasso.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/funding/indiegogo.svg b/app/Resources/icons/funding/indiegogo.svg index 0d6240d3..beb3ca26 100755 --- a/app/Resources/icons/funding/indiegogo.svg +++ b/app/Resources/icons/funding/indiegogo.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/funding/kickstarter.svg b/app/Resources/icons/funding/kickstarter.svg index 2f055f75..a300d7be 100755 --- a/app/Resources/icons/funding/kickstarter.svg +++ b/app/Resources/icons/funding/kickstarter.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/funding/kisskissbankbank.svg b/app/Resources/icons/funding/kisskissbankbank.svg index f3041450..4755a204 100755 --- a/app/Resources/icons/funding/kisskissbankbank.svg +++ b/app/Resources/icons/funding/kisskissbankbank.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/funding/liberapay.svg b/app/Resources/icons/funding/liberapay.svg index e3e261bc..827862fc 100755 --- a/app/Resources/icons/funding/liberapay.svg +++ b/app/Resources/icons/funding/liberapay.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/funding/patreon.svg b/app/Resources/icons/funding/patreon.svg index 0c02798f..39e20c5a 100755 --- a/app/Resources/icons/funding/patreon.svg +++ b/app/Resources/icons/funding/patreon.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/funding/paypal.svg b/app/Resources/icons/funding/paypal.svg index 5e055a78..2b525b0c 100755 --- a/app/Resources/icons/funding/paypal.svg +++ b/app/Resources/icons/funding/paypal.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/funding/tipeee.svg b/app/Resources/icons/funding/tipeee.svg index 2984b9b3..e3797fee 100755 --- a/app/Resources/icons/funding/tipeee.svg +++ b/app/Resources/icons/funding/tipeee.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/funding/ulule.svg b/app/Resources/icons/funding/ulule.svg index c4231b3e..c5002f2d 100755 --- a/app/Resources/icons/funding/ulule.svg +++ b/app/Resources/icons/funding/ulule.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/amazon.svg b/app/Resources/icons/podcasting/amazon.svg index 82ba8b79..38341ba6 100755 --- a/app/Resources/icons/podcasting/amazon.svg +++ b/app/Resources/icons/podcasting/amazon.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/antennapod.svg b/app/Resources/icons/podcasting/antennapod.svg index 26e9699d..0e0b9006 100755 --- a/app/Resources/icons/podcasting/antennapod.svg +++ b/app/Resources/icons/podcasting/antennapod.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/anytime.svg b/app/Resources/icons/podcasting/anytime.svg index cfa23d33..d7e778a7 100644 --- a/app/Resources/icons/podcasting/anytime.svg +++ b/app/Resources/icons/podcasting/anytime.svg @@ -1,4 +1,4 @@ - - - + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/apple.svg b/app/Resources/icons/podcasting/apple.svg index 358ce6f5..31e26446 100755 --- a/app/Resources/icons/podcasting/apple.svg +++ b/app/Resources/icons/podcasting/apple.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/blubrry.svg b/app/Resources/icons/podcasting/blubrry.svg index d3db4e25..a556a5d8 100755 --- a/app/Resources/icons/podcasting/blubrry.svg +++ b/app/Resources/icons/podcasting/blubrry.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/breaker.svg b/app/Resources/icons/podcasting/breaker.svg index 98fe46f3..8de3e6e6 100755 --- a/app/Resources/icons/podcasting/breaker.svg +++ b/app/Resources/icons/podcasting/breaker.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/breez.svg b/app/Resources/icons/podcasting/breez.svg index 9dbf46bd..d0901c86 100644 --- a/app/Resources/icons/podcasting/breez.svg +++ b/app/Resources/icons/podcasting/breez.svg @@ -1,6 +1,4 @@ - - - - - - + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/castamatic.svg b/app/Resources/icons/podcasting/castamatic.svg index 8fb53cfc..6c97e493 100644 --- a/app/Resources/icons/podcasting/castamatic.svg +++ b/app/Resources/icons/podcasting/castamatic.svg @@ -1,4 +1,4 @@ - - - + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/castbox.svg b/app/Resources/icons/podcasting/castbox.svg index f3b4a197..701e3721 100755 --- a/app/Resources/icons/podcasting/castbox.svg +++ b/app/Resources/icons/podcasting/castbox.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/castcoverage.svg b/app/Resources/icons/podcasting/castcoverage.svg deleted file mode 100644 index 37db9e3d..00000000 --- a/app/Resources/icons/podcasting/castcoverage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/Resources/icons/podcasting/castopod.svg b/app/Resources/icons/podcasting/castopod.svg index ff91790c..784f7818 100755 --- a/app/Resources/icons/podcasting/castopod.svg +++ b/app/Resources/icons/podcasting/castopod.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/castro.svg b/app/Resources/icons/podcasting/castro.svg index d3716c8e..189e7d5a 100755 --- a/app/Resources/icons/podcasting/castro.svg +++ b/app/Resources/icons/podcasting/castro.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/chartable.svg b/app/Resources/icons/podcasting/chartable.svg index 6383bbfc..46c49805 100755 --- a/app/Resources/icons/podcasting/chartable.svg +++ b/app/Resources/icons/podcasting/chartable.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/curiocaster.svg b/app/Resources/icons/podcasting/curiocaster.svg deleted file mode 100644 index 2d61da69..00000000 --- a/app/Resources/icons/podcasting/curiocaster.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/Resources/icons/podcasting/deezer.svg b/app/Resources/icons/podcasting/deezer.svg index 869b06ef..a22f53bf 100755 --- a/app/Resources/icons/podcasting/deezer.svg +++ b/app/Resources/icons/podcasting/deezer.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/default.svg b/app/Resources/icons/podcasting/default.svg new file mode 100644 index 00000000..09670128 --- /dev/null +++ b/app/Resources/icons/podcasting/default.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/escapepod.svg b/app/Resources/icons/podcasting/escapepod.svg deleted file mode 100644 index 3c652c94..00000000 --- a/app/Resources/icons/podcasting/escapepod.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/Resources/icons/podcasting/fountain.svg b/app/Resources/icons/podcasting/fountain.svg index 87d3b096..558aea45 100644 --- a/app/Resources/icons/podcasting/fountain.svg +++ b/app/Resources/icons/podcasting/fountain.svg @@ -1,4 +1,4 @@ - - - - + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/fyyd.svg b/app/Resources/icons/podcasting/fyyd.svg index f8b6518c..8f93cda4 100755 --- a/app/Resources/icons/podcasting/fyyd.svg +++ b/app/Resources/icons/podcasting/fyyd.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/google.svg b/app/Resources/icons/podcasting/google.svg index 51056db8..e580789c 100755 --- a/app/Resources/icons/podcasting/google.svg +++ b/app/Resources/icons/podcasting/google.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/gpodder.svg b/app/Resources/icons/podcasting/gpodder.svg index 1acbdc9c..a8e02542 100644 --- a/app/Resources/icons/podcasting/gpodder.svg +++ b/app/Resources/icons/podcasting/gpodder.svg @@ -1,3 +1,4 @@ - - - + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/hypercatcher.svg b/app/Resources/icons/podcasting/hypercatcher.svg deleted file mode 100644 index 9131519f..00000000 --- a/app/Resources/icons/podcasting/hypercatcher.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/Resources/icons/podcasting/ivoox.svg b/app/Resources/icons/podcasting/ivoox.svg index 6715e452..a8e02542 100755 --- a/app/Resources/icons/podcasting/ivoox.svg +++ b/app/Resources/icons/podcasting/ivoox.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/ivyfm.svg b/app/Resources/icons/podcasting/ivyfm.svg deleted file mode 100644 index 70475f98..00000000 --- a/app/Resources/icons/podcasting/ivyfm.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/Resources/icons/podcasting/jumplink.svg b/app/Resources/icons/podcasting/jumplink.svg deleted file mode 100644 index e5dc38f4..00000000 --- a/app/Resources/icons/podcasting/jumplink.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/Resources/icons/podcasting/kasts.svg b/app/Resources/icons/podcasting/kasts.svg deleted file mode 100644 index af8e6b0a..00000000 --- a/app/Resources/icons/podcasting/kasts.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/app/Resources/icons/podcasting/listennotes.svg b/app/Resources/icons/podcasting/listennotes.svg index 05f99886..3f7826f1 100755 --- a/app/Resources/icons/podcasting/listennotes.svg +++ b/app/Resources/icons/podcasting/listennotes.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/overcast.svg b/app/Resources/icons/podcasting/overcast.svg index 74252263..3c30ae4a 100755 --- a/app/Resources/icons/podcasting/overcast.svg +++ b/app/Resources/icons/podcasting/overcast.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/playapod.svg b/app/Resources/icons/podcasting/playapod.svg deleted file mode 100644 index c06ebb1a..00000000 --- a/app/Resources/icons/podcasting/playapod.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/Resources/icons/podcasting/playerfm.svg b/app/Resources/icons/podcasting/playerfm.svg index fc24e26d..4e0adb91 100755 --- a/app/Resources/icons/podcasting/playerfm.svg +++ b/app/Resources/icons/podcasting/playerfm.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/plink.svg b/app/Resources/icons/podcasting/plink.svg index ef7781d8..4f31d3e9 100644 --- a/app/Resources/icons/podcasting/plink.svg +++ b/app/Resources/icons/podcasting/plink.svg @@ -1,3 +1,5 @@ - - - + + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/pocketcasts.svg b/app/Resources/icons/podcasting/pocketcasts.svg index bb551312..62b2b533 100755 --- a/app/Resources/icons/podcasting/pocketcasts.svg +++ b/app/Resources/icons/podcasting/pocketcasts.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/podbean.svg b/app/Resources/icons/podcasting/podbean.svg index c8577b5f..71d160bd 100755 --- a/app/Resources/icons/podcasting/podbean.svg +++ b/app/Resources/icons/podcasting/podbean.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/podcastaddict.svg b/app/Resources/icons/podcasting/podcastaddict.svg index 2db58457..83e02432 100755 --- a/app/Resources/icons/podcasting/podcastaddict.svg +++ b/app/Resources/icons/podcasting/podcastaddict.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/podcastchapters.svg b/app/Resources/icons/podcasting/podcastchapters.svg deleted file mode 100644 index 6d06725c..00000000 --- a/app/Resources/icons/podcasting/podcastchapters.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/app/Resources/icons/podcasting/podcastguru.svg b/app/Resources/icons/podcasting/podcastguru.svg index 3d1e1e1e..3d3909fa 100644 --- a/app/Resources/icons/podcasting/podcastguru.svg +++ b/app/Resources/icons/podcasting/podcastguru.svg @@ -1,4 +1,4 @@ - - - - + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/podcastindex.svg b/app/Resources/icons/podcasting/podcastindex.svg index 4b88645e..9c46acc6 100755 --- a/app/Resources/icons/podcasting/podcastindex.svg +++ b/app/Resources/icons/podcasting/podcastindex.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/podchaser.svg b/app/Resources/icons/podcasting/podchaser.svg index ca80217d..5996f9d4 100755 --- a/app/Resources/icons/podcasting/podchaser.svg +++ b/app/Resources/icons/podcasting/podchaser.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/podcloud.svg b/app/Resources/icons/podcasting/podcloud.svg index 9abda5d7..eee11508 100755 --- a/app/Resources/icons/podcasting/podcloud.svg +++ b/app/Resources/icons/podcasting/podcloud.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/podfriend.svg b/app/Resources/icons/podcasting/podfriend.svg index 6c96c60d..7b84e85d 100755 --- a/app/Resources/icons/podcasting/podfriend.svg +++ b/app/Resources/icons/podcasting/podfriend.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/podinstall.svg b/app/Resources/icons/podcasting/podinstall.svg index 9bec6ac6..ccc7c5be 100755 --- a/app/Resources/icons/podcasting/podinstall.svg +++ b/app/Resources/icons/podcasting/podinstall.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/podlink.svg b/app/Resources/icons/podcasting/podlink.svg index c980f8f6..e0ad3e83 100755 --- a/app/Resources/icons/podcasting/podlink.svg +++ b/app/Resources/icons/podcasting/podlink.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/podlp.svg b/app/Resources/icons/podcasting/podlp.svg index 4ea74517..f4a9a5c7 100644 --- a/app/Resources/icons/podcasting/podlp.svg +++ b/app/Resources/icons/podcasting/podlp.svg @@ -1,4 +1,4 @@ - - - - + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/podnews.svg b/app/Resources/icons/podcasting/podnews.svg deleted file mode 100644 index 786e65f0..00000000 --- a/app/Resources/icons/podcasting/podnews.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/app/Resources/icons/podcasting/podstation.svg b/app/Resources/icons/podcasting/podstation.svg deleted file mode 100644 index 2e1a9660..00000000 --- a/app/Resources/icons/podcasting/podstation.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/Resources/icons/podcasting/podtail.svg b/app/Resources/icons/podcasting/podtail.svg index 09426777..b0b10dd9 100755 --- a/app/Resources/icons/podcasting/podtail.svg +++ b/app/Resources/icons/podcasting/podtail.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/podverse.svg b/app/Resources/icons/podcasting/podverse.svg index ccec56af..4a710f64 100755 --- a/app/Resources/icons/podcasting/podverse.svg +++ b/app/Resources/icons/podcasting/podverse.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/radiopublic.svg b/app/Resources/icons/podcasting/radiopublic.svg index 1803cccd..de3ff737 100755 --- a/app/Resources/icons/podcasting/radiopublic.svg +++ b/app/Resources/icons/podcasting/radiopublic.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/sphinxchat.svg b/app/Resources/icons/podcasting/sphinxchat.svg index f27b0e48..95c2c4c4 100644 --- a/app/Resources/icons/podcasting/sphinxchat.svg +++ b/app/Resources/icons/podcasting/sphinxchat.svg @@ -1,4 +1,4 @@ - - - - + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/spotify.svg b/app/Resources/icons/podcasting/spotify.svg index da84da85..43d56a18 100755 --- a/app/Resources/icons/podcasting/spotify.svg +++ b/app/Resources/icons/podcasting/spotify.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/spreaker.svg b/app/Resources/icons/podcasting/spreaker.svg index 06ddebe3..30cc454c 100755 --- a/app/Resources/icons/podcasting/spreaker.svg +++ b/app/Resources/icons/podcasting/spreaker.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/stitcher.svg b/app/Resources/icons/podcasting/stitcher.svg index b2f7c0d0..0d59cba8 100755 --- a/app/Resources/icons/podcasting/stitcher.svg +++ b/app/Resources/icons/podcasting/stitcher.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/tsacdop.svg b/app/Resources/icons/podcasting/tsacdop.svg index e5459ffb..0d3e288f 100644 --- a/app/Resources/icons/podcasting/tsacdop.svg +++ b/app/Resources/icons/podcasting/tsacdop.svg @@ -1,4 +1,4 @@ - - - - + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/tunein.svg b/app/Resources/icons/podcasting/tunein.svg index 8ebef8d4..da721274 100755 --- a/app/Resources/icons/podcasting/tunein.svg +++ b/app/Resources/icons/podcasting/tunein.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/podcasting/zion.svg b/app/Resources/icons/podcasting/zion.svg index b2650bac..20c2f2f7 100644 --- a/app/Resources/icons/podcasting/zion.svg +++ b/app/Resources/icons/podcasting/zion.svg @@ -1,3 +1,4 @@ - - - + + + + \ No newline at end of file diff --git a/app/Resources/icons/social/castopod.svg b/app/Resources/icons/social/castopod.svg index ff91790c..784f7818 100755 --- a/app/Resources/icons/social/castopod.svg +++ b/app/Resources/icons/social/castopod.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/social/default.svg b/app/Resources/icons/social/default.svg new file mode 100644 index 00000000..3e1b678a --- /dev/null +++ b/app/Resources/icons/social/default.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/Resources/icons/social/discord.svg b/app/Resources/icons/social/discord.svg index 52ee5fa3..9a63df1f 100644 --- a/app/Resources/icons/social/discord.svg +++ b/app/Resources/icons/social/discord.svg @@ -1 +1,4 @@ - + + + + \ No newline at end of file diff --git a/app/Resources/icons/social/facebook.svg b/app/Resources/icons/social/facebook.svg index 4d215877..c6ddd7e9 100755 --- a/app/Resources/icons/social/facebook.svg +++ b/app/Resources/icons/social/facebook.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/social/funkwhale.svg b/app/Resources/icons/social/funkwhale.svg index 4abbeaad..95b5abf6 100755 --- a/app/Resources/icons/social/funkwhale.svg +++ b/app/Resources/icons/social/funkwhale.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/social/instagram.svg b/app/Resources/icons/social/instagram.svg index a56bb3e9..7726b140 100755 --- a/app/Resources/icons/social/instagram.svg +++ b/app/Resources/icons/social/instagram.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/social/linkedin.svg b/app/Resources/icons/social/linkedin.svg index 78000a7a..9042d1ee 100755 --- a/app/Resources/icons/social/linkedin.svg +++ b/app/Resources/icons/social/linkedin.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/social/mastodon.svg b/app/Resources/icons/social/mastodon.svg index f9315563..7bab6080 100755 --- a/app/Resources/icons/social/mastodon.svg +++ b/app/Resources/icons/social/mastodon.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/social/misskey.svg b/app/Resources/icons/social/misskey.svg new file mode 100644 index 00000000..2b8b3850 --- /dev/null +++ b/app/Resources/icons/social/misskey.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/Resources/icons/social/mobilizon.svg b/app/Resources/icons/social/mobilizon.svg index b7fd11a6..564f3ca6 100755 --- a/app/Resources/icons/social/mobilizon.svg +++ b/app/Resources/icons/social/mobilizon.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/social/peertube.svg b/app/Resources/icons/social/peertube.svg index 0fb16946..4cf8e7f8 100755 --- a/app/Resources/icons/social/peertube.svg +++ b/app/Resources/icons/social/peertube.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/social/pixelfed.svg b/app/Resources/icons/social/pixelfed.svg index b3471340..cb3e4d66 100755 --- a/app/Resources/icons/social/pixelfed.svg +++ b/app/Resources/icons/social/pixelfed.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/social/pleroma.svg b/app/Resources/icons/social/pleroma.svg new file mode 100644 index 00000000..657fe8ac --- /dev/null +++ b/app/Resources/icons/social/pleroma.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/Resources/icons/social/plume.svg b/app/Resources/icons/social/plume.svg index a1009fa5..841b3c0e 100755 --- a/app/Resources/icons/social/plume.svg +++ b/app/Resources/icons/social/plume.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/social/reddit.svg b/app/Resources/icons/social/reddit.svg index a97eb3e2..8a0d2f72 100755 --- a/app/Resources/icons/social/reddit.svg +++ b/app/Resources/icons/social/reddit.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/social/slack.svg b/app/Resources/icons/social/slack.svg index 03fa2ede..3737d5a2 100755 --- a/app/Resources/icons/social/slack.svg +++ b/app/Resources/icons/social/slack.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/social/tiktok.svg b/app/Resources/icons/social/tiktok.svg index 0362bd93..d6a380d2 100755 --- a/app/Resources/icons/social/tiktok.svg +++ b/app/Resources/icons/social/tiktok.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/social/twitch.svg b/app/Resources/icons/social/twitch.svg index dbc56ddc..79f77875 100755 --- a/app/Resources/icons/social/twitch.svg +++ b/app/Resources/icons/social/twitch.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/social/twitter.svg b/app/Resources/icons/social/twitter.svg index c32aa097..1b07620c 100755 --- a/app/Resources/icons/social/twitter.svg +++ b/app/Resources/icons/social/twitter.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/social/writefreely.svg b/app/Resources/icons/social/writefreely.svg index e6a02e09..21bc015a 100755 --- a/app/Resources/icons/social/writefreely.svg +++ b/app/Resources/icons/social/writefreely.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Resources/icons/social/youtube.svg b/app/Resources/icons/social/youtube.svg index dca4bf6f..3d875054 100755 --- a/app/Resources/icons/social/youtube.svg +++ b/app/Resources/icons/social/youtube.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/composer.lock b/composer.lock index 3007b31d..6b1d3735 100644 --- a/composer.lock +++ b/composer.lock @@ -12,7 +12,7 @@ "source": { "type": "git", "url": "https://code.castopod.org/adaures/ipcat-php", - "reference": "e55160afdcd5040abb60c04cf7a95030fe3b967b" + "reference": "144fb12141c636b6b4baa72f1f974b388e4994b5" }, "require": { "php": ">=5.4" @@ -20,7 +20,7 @@ "type": "library", "autoload": { "psr-4": { - "AdAures\\Ipcat\\": "" + "AdAures\\Ipcat\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -39,7 +39,7 @@ ], "description": "Categorization of IP Addresses adapted to PHP 5.4+ from https://github.com/client9/ipcat", "homepage": "https://code.castopod.org/adaures/ipcat-php", - "time": "2022-02-20T14:08:26+00:00" + "time": "2022-02-24T14:34:54+00:00" }, { "name": "adaures/podcast-persons-taxonomy", diff --git a/modules/Analytics/Helpers/analytics_helper.php b/modules/Analytics/Helpers/analytics_helper.php index 399fe2e0..c9b582a7 100644 --- a/modules/Analytics/Helpers/analytics_helper.php +++ b/modules/Analytics/Helpers/analytics_helper.php @@ -2,17 +2,17 @@ declare(strict_types=1); -use AdAures\Ipcat\IpDb; -use CodeIgniter\Router\Exceptions\RouterException; -use Config\Services; -use GeoIp2\Database\Reader; -use Opawg\UserAgentsPhp\UserAgents; /** * @copyright 2020 Ad Aures * @license https://www.gnu.org/licenses/agpl-3.0.en.html AGPL3 * @link https://castopod.org/ */ +use AdAures\Ipcat\IpDb; +use CodeIgniter\Router\Exceptions\RouterException; +use Config\Services; +use GeoIp2\Database\Reader; +use Opawg\UserAgentsPhp\UserAgents; use WhichBrowser\Parser; if (! function_exists('base64_url_encode')) { diff --git a/themes/cp_admin/_partials/_nav_aside.php b/themes/cp_admin/_partials/_nav_aside.php index 0dbe4d0d..442207e7 100644 --- a/themes/cp_admin/_partials/_nav_aside.php +++ b/themes/cp_admin/_partials/_nav_aside.php @@ -10,7 +10,7 @@ diff --git a/themes/cp_admin/podcast/platforms.php b/themes/cp_admin/podcast/platforms.php index 38d589d5..8bb37fd1 100644 --- a/themes/cp_admin/podcast/platforms.php +++ b/themes/cp_admin/podcast/platforms.php @@ -21,14 +21,22 @@
- submit_url === ''): ?> + slug, + 'text-skin-muted text-4xl', + $platform->type +) ?> + + submit_url, icon( - $platform->type . '/' . $platform->slug, + $platform->slug, 'text-skin-muted text-4xl', + $platform->type ), [ - 'class' => 'mb-1 text-skin-muted hover:text-skin-base', + 'class' => 'text-skin-muted hover:text-skin-base', 'target' => '_blank', 'rel' => 'noopener noreferrer', 'data-tooltip' => 'bottom', @@ -37,7 +45,8 @@ ]), ], ) ?> -
+ +
home_url, icon('external-link', 'mx-auto'), [ 'class' => 'flex-1 text-skin-muted hover:text-skin-base', 'target' => '_blank', diff --git a/themes/cp_app/embed.php b/themes/cp_app/embed.php index 3b6573bc..17512924 100644 --- a/themes/cp_app/embed.php +++ b/themes/cp_app/embed.php @@ -24,7 +24,7 @@
+ ]) ?>" target="_blank" rel="noopener noreferrer">
number, $episode->season_number, 'text-xs font-semibold !no-underline border px-1 border-gray-500', true) ?> title ?> diff --git a/themes/cp_app/home.php b/themes/cp_app/home.php index b9c1d542..bb7d7255 100644 --- a/themes/cp_app/home.php +++ b/themes/cp_app/home.php @@ -99,7 +99,7 @@ - 'Castopod' . icon('social/castopod', 'ml-1 text-lg') . '', + 'Castopod' . icon('castopod', 'ml-1 text-lg', 'social') . '', ]) ?> diff --git a/themes/cp_app/pages/map.php b/themes/cp_app/pages/map.php index 83ebf432..25efdbac 100644 --- a/themes/cp_app/pages/map.php +++ b/themes/cp_app/pages/map.php @@ -58,7 +58,7 @@ - 'Castopod' . icon('social/castopod', 'ml-1 text-lg') . '', + 'Castopod' . icon('castopod', 'ml-1 text-lg', 'social') . '', ]) ?> diff --git a/themes/cp_app/podcast/_partials/funding_links_modal.php b/themes/cp_app/podcast/_partials/funding_links_modal.php index 4c4a4cb4..add82031 100644 --- a/themes/cp_app/podcast/_partials/funding_links_modal.php +++ b/themes/cp_app/podcast/_partials/funding_links_modal.php @@ -16,7 +16,7 @@ aria-label="" class="self-start p-1 text-2xl rounded-full focus:ring-accent">
-
+
fundingPlatforms as $fundingPlatform): ?> is_visible): ?> + class="inline-flex items-center w-full font-semibold text-accent-base hover:text-accent-hover focus:ring-accent"> type . - '/' . - $fundingPlatform->slug, - 'mr-2', - ) . $fundingPlatform->link_url ?> + $fundingPlatform->slug, + 'mr-2 flex-shrink-0', + $fundingPlatform->type + ) . '' . $fundingPlatform->link_url . '' ?> diff --git a/themes/cp_app/podcast/_partials/sidebar.php b/themes/cp_app/podcast/_partials/sidebar.php index 5fb038ec..94b3fa73 100644 --- a/themes/cp_app/podcast/_partials/sidebar.php +++ b/themes/cp_app/podcast/_partials/sidebar.php @@ -59,7 +59,7 @@

copyright ?>

- 'Castopod' . icon('social/castopod', 'ml-1 text-lg') . '', + 'Castopod' . icon('castopod', 'ml-1 text-lg', 'social') . '', ]) ?>

diff --git a/themes/cp_app/podcast/follow.php b/themes/cp_app/podcast/follow.php index a08f4210..b2d3ad37 100644 --- a/themes/cp_app/podcast/follow.php +++ b/themes/cp_app/podcast/follow.php @@ -69,7 +69,7 @@ class="flex-col w-full px-2 py-4 mt-auto text-xs text-center border-t text-skin-muted border-subtle"> - 'Castopod' . icon('social/castopod', 'ml-1 text-lg') . '', + 'Castopod' . icon('castopod', 'ml-1 text-lg', 'social') . '', ]) ?> diff --git a/themes/cp_app/post/remote_action.php b/themes/cp_app/post/remote_action.php index 29e2e6a0..ba251e49 100644 --- a/themes/cp_app/post/remote_action.php +++ b/themes/cp_app/post/remote_action.php @@ -60,7 +60,7 @@ class="flex-col w-full px-2 py-4 mt-auto text-xs text-center border-t text-skin-muted border-subtle"> - 'Castopod' . icon('social/castopod', 'ml-1 text-lg') . '', + 'Castopod' . icon('castopod', 'ml-1 text-lg', 'social') . '', ]) ?> diff --git a/themes/cp_auth/_layout.php b/themes/cp_auth/_layout.php index fe6c3bfa..57933dcc 100644 --- a/themes/cp_auth/_layout.php +++ b/themes/cp_auth/_layout.php @@ -33,7 +33,7 @@ renderSection('footer') ?> - 'Castopod' . icon('social/castopod', 'ml-1 text-lg') . '', + 'Castopod' . icon('castopod', 'ml-1 text-lg', 'social') . '', ]) ?> diff --git a/themes/cp_install/_layout.php b/themes/cp_install/_layout.php index 30d24d6b..c5b919aa 100644 --- a/themes/cp_install/_layout.php +++ b/themes/cp_install/_layout.php @@ -29,7 +29,7 @@