diff --git a/package-lock.json b/package-lock.json index 10078f8..dcec8df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "3.4.0", + "version": "3.4.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "3.4.0", + "version": "3.4.1", "license": "MIT", "dependencies": { "html-minifier-terser": "7.2.0", @@ -149,9 +149,9 @@ } }, "node_modules/@11ty/eleventy-dev-server/node_modules/@11ty/eleventy-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@11ty/eleventy-utils/-/eleventy-utils-2.0.2.tgz", - "integrity": "sha512-Lh/QxwoG10ElkO4WZlwlEqM/d58sreVfJ+I8bcL+QEwb5cGNHTuOlBnyZ2zcBKJohHINuo4zGMVrN83LBLIAaw==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@11ty/eleventy-utils/-/eleventy-utils-2.0.5.tgz", + "integrity": "sha512-onKf5DMcS5Ebs5z40XfTFVu1IWFd6ILmtQE9kpduBNKLdA5SnC22JUREMaFzRpvXSo5PnOvlttSpfyh7EDkqag==", "dev": true, "license": "MIT", "engines": { @@ -203,9 +203,9 @@ } }, "node_modules/@11ty/eleventy-plugin-bundle/node_modules/@11ty/eleventy-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@11ty/eleventy-utils/-/eleventy-utils-2.0.2.tgz", - "integrity": "sha512-Lh/QxwoG10ElkO4WZlwlEqM/d58sreVfJ+I8bcL+QEwb5cGNHTuOlBnyZ2zcBKJohHINuo4zGMVrN83LBLIAaw==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@11ty/eleventy-utils/-/eleventy-utils-2.0.5.tgz", + "integrity": "sha512-onKf5DMcS5Ebs5z40XfTFVu1IWFd6ILmtQE9kpduBNKLdA5SnC22JUREMaFzRpvXSo5PnOvlttSpfyh7EDkqag==", "dev": true, "license": "MIT", "engines": { @@ -1081,9 +1081,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001715", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz", - "integrity": "sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==", + "version": "1.0.30001716", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001716.tgz", + "integrity": "sha512-49/c1+x3Kwz7ZIWt+4DvK3aMJy9oYXXG6/97JKsnjdCk/6n9vVyWL8NAwVt95Lwt9eigI10Hl782kDfZUUlRXw==", "dev": true, "funding": [ { @@ -1805,9 +1805,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.143", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.143.tgz", - "integrity": "sha512-QqklJMOFBMqe46k8iIOwA9l2hz57V2OKMmP5eSWcUvwx+mASAsbU+wkF1pHjn9ZVSBPrsYWr4/W/95y5SwYg2g==", + "version": "1.5.145", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.145.tgz", + "integrity": "sha512-pZ5EcTWRq/055MvSBgoFEyKf2i4apwfoqJbK/ak2jnFq8oHjZ+vzc3AhRcz37Xn+ZJfL58R666FLJx0YOK9yTw==", "dev": true, "license": "ISC" }, diff --git a/package.json b/package.json index 9671892..570441d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "3.4.0", + "version": "3.4.1", "description": "The source for my personal site. Built using 11ty (and other tools).", "type": "module", "engines": { diff --git a/queries/functions/get_feed_data.psql b/queries/functions/get_feed_data.sql similarity index 100% rename from queries/functions/get_feed_data.psql rename to queries/functions/get_feed_data.sql diff --git a/queries/functions/get_tagged_content.psql b/queries/functions/get_tagged_content.sql similarity index 100% rename from queries/functions/get_tagged_content.psql rename to queries/functions/get_tagged_content.sql diff --git a/queries/functions/parse_country_field.psql b/queries/functions/parse_country_field.sql similarity index 100% rename from queries/functions/parse_country_field.psql rename to queries/functions/parse_country_field.sql diff --git a/queries/functions/search.psql b/queries/functions/search.sql similarity index 100% rename from queries/functions/search.psql rename to queries/functions/search.sql diff --git a/queries/functions/slugify.psql b/queries/functions/slugify.psql deleted file mode 100644 index e6ce8d8..0000000 --- a/queries/functions/slugify.psql +++ /dev/null @@ -1,13 +0,0 @@ -CREATE OR REPLACE FUNCTION slugify(input TEXT) -RETURNS TEXT AS $$ -BEGIN - RETURN lower( - regexp_replace( - unaccent( - regexp_replace(input, '[^\w\s-]', '', 'g') - ), - '\s+', '-', 'g' - ) - ); -END; -$$ LANGUAGE plpgsql IMMUTABLE; diff --git a/queries/functions/slugify.sql b/queries/functions/slugify.sql new file mode 100644 index 0000000..edf4836 --- /dev/null +++ b/queries/functions/slugify.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE FUNCTION slugify(input TEXT) +RETURNS TEXT AS $$ +BEGIN + RETURN lower(regexp_replace(unaccent(regexp_replace(input, '[^\w\s-]', '', 'g')), '\s+', '-', 'g')); +END; +$$ LANGUAGE plpgsql IMMUTABLE; diff --git a/queries/functions/update_album_key.psql b/queries/functions/update_album_key.sql similarity index 100% rename from queries/functions/update_album_key.psql rename to queries/functions/update_album_key.sql diff --git a/queries/functions/update_artist_key.psql b/queries/functions/update_artist_key.sql similarity index 100% rename from queries/functions/update_artist_key.psql rename to queries/functions/update_artist_key.sql diff --git a/queries/functions/update_days_read.psql b/queries/functions/update_days_read.sql similarity index 99% rename from queries/functions/update_days_read.psql rename to queries/functions/update_days_read.sql index ac991d5..3af0ab0 100644 --- a/queries/functions/update_days_read.psql +++ b/queries/functions/update_days_read.sql @@ -6,21 +6,17 @@ DECLARE last_read DATE; BEGIN SELECT (NOW() AT TIME ZONE 'America/Los_Angeles')::DATE INTO pacific_today; - SELECT COALESCE(last_read_date::DATE, pacific_today - INTERVAL '1 day') INTO last_read FROM reading_streak LIMIT 1; - IF last_read < pacific_today - INTERVAL '1 day' THEN UPDATE reading_streak SET days_read = 0, last_read_date = NOW() AT TIME ZONE 'America/Los_Angeles' WHERE id = 1; END IF; - IF last_read IS DISTINCT FROM pacific_today THEN UPDATE reading_streak SET days_read = days_read + 1, last_read_date = NOW() AT TIME ZONE 'America/Los_Angeles' WHERE id = 1; END IF; - RETURN NEW; END; $$ LANGUAGE plpgsql; diff --git a/queries/functions/update_listen_totals.psql b/queries/functions/update_listen_totals.sql similarity index 100% rename from queries/functions/update_listen_totals.psql rename to queries/functions/update_listen_totals.sql diff --git a/queries/functions/update_scheduled_episode_status.psql b/queries/functions/update_scheduled_episode_status.sql similarity index 99% rename from queries/functions/update_scheduled_episode_status.psql rename to queries/functions/update_scheduled_episode_status.sql index 5f726b0..066a454 100644 --- a/queries/functions/update_scheduled_episode_status.psql +++ b/queries/functions/update_scheduled_episode_status.sql @@ -5,7 +5,6 @@ BEGIN SET status = 'aired' WHERE air_date < CURRENT_DATE AND status = 'upcoming'; - RETURN NEW; END; $$ LANGUAGE plpgsql; diff --git a/queries/functions/update_scheduled_on_watch.psql b/queries/functions/update_scheduled_on_watch.sql similarity index 98% rename from queries/functions/update_scheduled_on_watch.psql rename to queries/functions/update_scheduled_on_watch.sql index cfc1dc4..913ac8c 100644 --- a/queries/functions/update_scheduled_on_watch.psql +++ b/queries/functions/update_scheduled_on_watch.sql @@ -6,7 +6,6 @@ BEGIN WHERE show_id = NEW.show AND season_number = NEW.season_number AND episode_number = NEW.episode_number; - RETURN NEW; END; $$ LANGUAGE plpgsql; diff --git a/queries/jobs/update_scheduled_episodes.psql b/queries/jobs/update_scheduled_episodes.sql similarity index 100% rename from queries/jobs/update_scheduled_episodes.psql rename to queries/jobs/update_scheduled_episodes.sql diff --git a/queries/selects/top_albums.psql b/queries/selects/top_albums.sql similarity index 100% rename from queries/selects/top_albums.psql rename to queries/selects/top_albums.sql diff --git a/queries/selects/top_artists.psql b/queries/selects/top_artists.sql similarity index 100% rename from queries/selects/top_artists.psql rename to queries/selects/top_artists.sql diff --git a/queries/triggers/decrement_total_plays.psql b/queries/triggers/decrement_total_plays.sql similarity index 99% rename from queries/triggers/decrement_total_plays.psql rename to queries/triggers/decrement_total_plays.sql index d5ef70a..5dc3eb6 100644 --- a/queries/triggers/decrement_total_plays.psql +++ b/queries/triggers/decrement_total_plays.sql @@ -2,12 +2,10 @@ BEGIN UPDATE artists SET total_plays = total_plays - 1 WHERE name_string = OLD.artist_name; - UPDATE albums SET total_plays = total_plays - 1 WHERE name = OLD.album_name AND artist_name = OLD.artist_name; - UPDATE genres SET total_plays = total_plays - 1 WHERE id = ( @@ -15,6 +13,5 @@ BEGIN FROM artists WHERE name_string = OLD.artist_name ); - RETURN OLD; END; diff --git a/queries/triggers/mark_scheduled_as_watched.psql b/queries/triggers/mark_scheduled_as_watched.sql similarity index 100% rename from queries/triggers/mark_scheduled_as_watched.psql rename to queries/triggers/mark_scheduled_as_watched.sql diff --git a/queries/triggers/update_days_read.psql b/queries/triggers/update_days_read.sql similarity index 100% rename from queries/triggers/update_days_read.psql rename to queries/triggers/update_days_read.sql diff --git a/queries/triggers/update_scheduled_status.psql b/queries/triggers/update_scheduled_status.sql similarity index 99% rename from queries/triggers/update_scheduled_status.psql rename to queries/triggers/update_scheduled_status.sql index c44484b..228a928 100644 --- a/queries/triggers/update_scheduled_status.psql +++ b/queries/triggers/update_scheduled_status.sql @@ -4,7 +4,6 @@ BEGIN IF NEW.air_date < CURRENT_DATE AND NEW.status = 'upcoming' THEN NEW.status := 'aired'; END IF; - RETURN NEW; END; $$ LANGUAGE plpgsql; diff --git a/queries/triggers/update_total_plays.psql b/queries/triggers/update_total_plays.sql similarity index 99% rename from queries/triggers/update_total_plays.psql rename to queries/triggers/update_total_plays.sql index 693e491..a533664 100644 --- a/queries/triggers/update_total_plays.psql +++ b/queries/triggers/update_total_plays.sql @@ -2,12 +2,10 @@ BEGIN UPDATE artists SET total_plays = total_plays + 1 WHERE name_string = NEW.artist_name; - UPDATE albums SET total_plays = total_plays + 1 WHERE key = NEW.album_key AND artist_name = NEW.artist_name; - UPDATE genres SET total_plays = total_plays + 1 WHERE id = ( @@ -15,6 +13,5 @@ BEGIN FROM artists WHERE name_string = NEW.artist_name ); - RETURN NEW; END; diff --git a/queries/views/content/blogroll.psql b/queries/views/content/blogroll.sql similarity index 100% rename from queries/views/content/blogroll.psql rename to queries/views/content/blogroll.sql diff --git a/queries/views/content/links.psql b/queries/views/content/links.sql similarity index 100% rename from queries/views/content/links.psql rename to queries/views/content/links.sql diff --git a/queries/views/content/posts.psql b/queries/views/content/posts.sql similarity index 100% rename from queries/views/content/posts.psql rename to queries/views/content/posts.sql diff --git a/queries/views/feeds/all_activity.psql b/queries/views/feeds/all_activity.sql similarity index 100% rename from queries/views/feeds/all_activity.psql rename to queries/views/feeds/all_activity.sql diff --git a/queries/views/feeds/headers.psql b/queries/views/feeds/headers.sql similarity index 100% rename from queries/views/feeds/headers.psql rename to queries/views/feeds/headers.sql diff --git a/queries/views/feeds/recent_activity.psql b/queries/views/feeds/recent_activity.sql similarity index 100% rename from queries/views/feeds/recent_activity.psql rename to queries/views/feeds/recent_activity.sql diff --git a/queries/views/feeds/redirects.psql b/queries/views/feeds/redirects.sql similarity index 100% rename from queries/views/feeds/redirects.psql rename to queries/views/feeds/redirects.sql diff --git a/queries/views/feeds/robots.psql b/queries/views/feeds/robots.sql similarity index 100% rename from queries/views/feeds/robots.psql rename to queries/views/feeds/robots.sql diff --git a/queries/views/feeds/search.psql b/queries/views/feeds/search.sql similarity index 100% rename from queries/views/feeds/search.psql rename to queries/views/feeds/search.sql diff --git a/queries/views/feeds/sitemap.psql b/queries/views/feeds/sitemap.sql similarity index 100% rename from queries/views/feeds/sitemap.psql rename to queries/views/feeds/sitemap.sql diff --git a/queries/views/feeds/stats.psql b/queries/views/feeds/stats.sql similarity index 100% rename from queries/views/feeds/stats.psql rename to queries/views/feeds/stats.sql diff --git a/queries/views/feeds/subscribe.psql b/queries/views/feeds/subscribe.sql similarity index 100% rename from queries/views/feeds/subscribe.psql rename to queries/views/feeds/subscribe.sql diff --git a/queries/views/feeds/syndication.psql b/queries/views/feeds/syndication.sql similarity index 100% rename from queries/views/feeds/syndication.psql rename to queries/views/feeds/syndication.sql diff --git a/queries/views/feeds/tagged_content.psql b/queries/views/feeds/tagged_content.sql similarity index 100% rename from queries/views/feeds/tagged_content.psql rename to queries/views/feeds/tagged_content.sql diff --git a/queries/views/feeds/tags.psql b/queries/views/feeds/tags.sql similarity index 100% rename from queries/views/feeds/tags.psql rename to queries/views/feeds/tags.sql diff --git a/queries/views/globals/index.psql b/queries/views/globals/index.sql similarity index 100% rename from queries/views/globals/index.psql rename to queries/views/globals/index.sql diff --git a/queries/views/globals/nav.psql b/queries/views/globals/nav.sql similarity index 100% rename from queries/views/globals/nav.psql rename to queries/views/globals/nav.sql diff --git a/queries/views/globals/pages.psql b/queries/views/globals/pages.sql similarity index 100% rename from queries/views/globals/pages.psql rename to queries/views/globals/pages.sql diff --git a/queries/views/media/books.psql b/queries/views/media/books.sql similarity index 100% rename from queries/views/media/books.psql rename to queries/views/media/books.sql diff --git a/queries/views/media/movies.psql b/queries/views/media/movies.sql similarity index 100% rename from queries/views/media/movies.psql rename to queries/views/media/movies.sql diff --git a/queries/views/media/music/album_releases.psql b/queries/views/media/music/album_releases.sql similarity index 100% rename from queries/views/media/music/album_releases.psql rename to queries/views/media/music/album_releases.sql diff --git a/queries/views/media/music/albums.psql b/queries/views/media/music/albums.sql similarity index 100% rename from queries/views/media/music/albums.psql rename to queries/views/media/music/albums.sql diff --git a/queries/views/media/music/artists.psql b/queries/views/media/music/artists.sql similarity index 100% rename from queries/views/media/music/artists.psql rename to queries/views/media/music/artists.sql diff --git a/queries/views/media/music/concerts.psql b/queries/views/media/music/concerts.sql similarity index 100% rename from queries/views/media/music/concerts.psql rename to queries/views/media/music/concerts.sql diff --git a/queries/views/media/music/genres.psql b/queries/views/media/music/genres.sql similarity index 100% rename from queries/views/media/music/genres.psql rename to queries/views/media/music/genres.sql diff --git a/queries/views/media/music/latest_listen.psql b/queries/views/media/music/latest_listen.sql similarity index 100% rename from queries/views/media/music/latest_listen.psql rename to queries/views/media/music/latest_listen.sql diff --git a/queries/views/media/music/listens.psql b/queries/views/media/music/listens.sql similarity index 100% rename from queries/views/media/music/listens.psql rename to queries/views/media/music/listens.sql diff --git a/queries/views/media/music/month/albums.psql b/queries/views/media/music/month/albums.sql similarity index 100% rename from queries/views/media/music/month/albums.psql rename to queries/views/media/music/month/albums.sql diff --git a/queries/views/media/music/month/artists.psql b/queries/views/media/music/month/artists.sql similarity index 100% rename from queries/views/media/music/month/artists.psql rename to queries/views/media/music/month/artists.sql diff --git a/queries/views/media/music/month/genres.psql b/queries/views/media/music/month/genres.sql similarity index 100% rename from queries/views/media/music/month/genres.psql rename to queries/views/media/music/month/genres.sql diff --git a/queries/views/media/music/month/tracks.psql b/queries/views/media/music/month/tracks.sql similarity index 100% rename from queries/views/media/music/month/tracks.psql rename to queries/views/media/music/month/tracks.sql diff --git a/queries/views/media/music/recent_tracks.psql b/queries/views/media/music/recent_tracks.sql similarity index 100% rename from queries/views/media/music/recent_tracks.psql rename to queries/views/media/music/recent_tracks.sql diff --git a/queries/views/media/music/week/albums.psql b/queries/views/media/music/week/albums.sql similarity index 100% rename from queries/views/media/music/week/albums.psql rename to queries/views/media/music/week/albums.sql diff --git a/queries/views/media/music/week/artists.psql b/queries/views/media/music/week/artists.sql similarity index 100% rename from queries/views/media/music/week/artists.psql rename to queries/views/media/music/week/artists.sql diff --git a/queries/views/media/music/week/genres.psql b/queries/views/media/music/week/genres.sql similarity index 100% rename from queries/views/media/music/week/genres.psql rename to queries/views/media/music/week/genres.sql diff --git a/queries/views/media/music/week/tracks.psql b/queries/views/media/music/week/tracks.sql similarity index 100% rename from queries/views/media/music/week/tracks.psql rename to queries/views/media/music/week/tracks.sql diff --git a/queries/views/media/recent_media.psql b/queries/views/media/recent_media.sql similarity index 100% rename from queries/views/media/recent_media.psql rename to queries/views/media/recent_media.sql diff --git a/queries/views/media/shows/last_watched_episodes.psql b/queries/views/media/shows/last_watched_episodes.sql similarity index 100% rename from queries/views/media/shows/last_watched_episodes.psql rename to queries/views/media/shows/last_watched_episodes.sql diff --git a/queries/views/media/shows/scheduled_episodes.psql b/queries/views/media/shows/scheduled_episodes.sql similarity index 100% rename from queries/views/media/shows/scheduled_episodes.psql rename to queries/views/media/shows/scheduled_episodes.sql diff --git a/queries/views/media/shows/scheduled_shows.psql b/queries/views/media/shows/scheduled_shows.sql similarity index 100% rename from queries/views/media/shows/scheduled_shows.psql rename to queries/views/media/shows/scheduled_shows.sql diff --git a/queries/views/media/shows/shows.psql b/queries/views/media/shows/shows.sql similarity index 100% rename from queries/views/media/shows/shows.psql rename to queries/views/media/shows/shows.sql