diff --git a/src/js/components/post-composer.js b/src/js/components/post-composer.js index 736fb47f..70f14212 100644 --- a/src/js/components/post-composer.js +++ b/src/js/components/post-composer.js @@ -328,7 +328,7 @@ class PostComposer extends Component { : await this.identityResolver.resolveHandle(didOrHandle); const rkey = parsedUrl.pathname.split("/")[4]; const postUri = `at://${did}/app.bsky.feed.post/${rkey}`; - this.quotedPost = await this.dataLayer.declarations.ensurePost(postUri); + this.quotedPost = await this.dataLayer.declarative.ensurePost(postUri); this.render(); } catch (error) { console.error("Error loading quoted post from link: ", error); diff --git a/src/js/dataLayer/dataLayer.js b/src/js/dataLayer/dataLayer.js index 630e1110..b3adeb3a 100644 --- a/src/js/dataLayer/dataLayer.js +++ b/src/js/dataLayer/dataLayer.js @@ -4,7 +4,7 @@ import { PreferencesProvider } from "./preferencesProvider.js"; import { Mutations } from "./mutations.js"; import { Requests } from "./requests.js"; import { Selectors } from "./selectors.js"; -import { Declarations } from "./declarations.js"; +import { Declarative } from "./declarative.js"; export class DataLayer { constructor(api) { @@ -30,7 +30,7 @@ export class DataLayer { this.preferencesProvider, this.isAuthenticated ); - this.declarations = new Declarations(this.selectors, this.requests); + this.declarative = new Declarative(this.selectors, this.requests); this.subscribers = []; } diff --git a/src/js/dataLayer/declarations.js b/src/js/dataLayer/declarative.js similarity index 99% rename from src/js/dataLayer/declarations.js rename to src/js/dataLayer/declarative.js index 3997f9e9..f49cd5d4 100644 --- a/src/js/dataLayer/declarations.js +++ b/src/js/dataLayer/declarative.js @@ -1,4 +1,4 @@ -export class Declarations { +export class Declarative { constructor(selectors, requests) { this.selectors = selectors; this.requests = requests; diff --git a/src/js/views/bookmarks.view.js b/src/js/views/bookmarks.view.js index 02a10dd0..2ad96458 100644 --- a/src/js/views/bookmarks.view.js +++ b/src/js/views/bookmarks.view.js @@ -86,7 +86,7 @@ class BookmarksView extends View { // Initial empty state renderPage(); - dataLayer.declarations.ensureCurrentUser().then(() => { + dataLayer.declarative.ensureCurrentUser().then(() => { renderPage(); }); diff --git a/src/js/views/chat.view.js b/src/js/views/chat.view.js index 25c7965b..27b2aee6 100644 --- a/src/js/views/chat.view.js +++ b/src/js/views/chat.view.js @@ -261,7 +261,7 @@ class ChatView extends View { root.addEventListener("page-enter", async () => { renderPage(); - await dataLayer.declarations.ensureCurrentUser(); + await dataLayer.declarative.ensureCurrentUser(); await loadConvoList({ reload: true }); }); diff --git a/src/js/views/chatDetail.view.js b/src/js/views/chatDetail.view.js index 7216789f..65e94160 100644 --- a/src/js/views/chatDetail.view.js +++ b/src/js/views/chatDetail.view.js @@ -715,7 +715,7 @@ class ChatDetailView extends View { root.addEventListener("page-enter", async () => { renderPage(); - dataLayer.declarations.ensureCurrentUser().then((currentUser) => { + dataLayer.declarative.ensureCurrentUser().then((currentUser) => { renderPage(); // Initialize message fetcher messageFetcher = new MessageFetcher( @@ -729,7 +729,7 @@ class ChatDetailView extends View { }); messageFetcher.start(); }); - await dataLayer.declarations.ensureConvo(convoId); + await dataLayer.declarative.ensureConvo(convoId); await loadMessages({ reload: true }); // Scroll to bottom of messages scrollToBottom({ onlyIfNeeded: true }); diff --git a/src/js/views/chatRequests.view.js b/src/js/views/chatRequests.view.js index c187779c..ccdcbd8a 100644 --- a/src/js/views/chatRequests.view.js +++ b/src/js/views/chatRequests.view.js @@ -214,10 +214,10 @@ class ChatRequestsView extends View { root.addEventListener("page-enter", async () => { renderPage(); - dataLayer.declarations.ensureCurrentUser().then(() => { + dataLayer.declarative.ensureCurrentUser().then(() => { renderPage(); }); - await dataLayer.declarations.ensureConvoList(); + await dataLayer.declarative.ensureConvoList(); renderPage(); }); diff --git a/src/js/views/feedDetail.view.js b/src/js/views/feedDetail.view.js index 7bb82d73..421076c2 100644 --- a/src/js/views/feedDetail.view.js +++ b/src/js/views/feedDetail.view.js @@ -147,11 +147,11 @@ class FeedDetailView extends View { root.addEventListener("page-enter", async () => { // Initial empty state renderPage(); - dataLayer.declarations.ensureCurrentUser().then(() => { + dataLayer.declarative.ensureCurrentUser().then(() => { renderPage(); }); // Load feed generator info - dataLayer.declarations.ensureFeedGenerator(feedUri).then(() => { + dataLayer.declarative.ensureFeedGenerator(feedUri).then(() => { renderPage(); }); await loadFeed(); diff --git a/src/js/views/feeds.view.js b/src/js/views/feeds.view.js index 0f67b7b9..095ec92a 100644 --- a/src/js/views/feeds.view.js +++ b/src/js/views/feeds.view.js @@ -96,10 +96,10 @@ class FeedsView extends View { root.addEventListener("page-enter", async () => { renderPage(); - dataLayer.declarations.ensureCurrentUser().then(() => { + dataLayer.declarative.ensureCurrentUser().then(() => { renderPage(); }); - await dataLayer.declarations.ensurePinnedFeedGenerators(); + await dataLayer.declarative.ensurePinnedFeedGenerators(); renderPage(); }); diff --git a/src/js/views/hashtag.view.js b/src/js/views/hashtag.view.js index 5ca2d637..cf33aa82 100644 --- a/src/js/views/hashtag.view.js +++ b/src/js/views/hashtag.view.js @@ -146,7 +146,7 @@ class HashtagView extends View { root.addEventListener("page-enter", async () => { // Initial empty state renderPage(); - dataLayer.declarations.ensureCurrentUser().then(() => { + dataLayer.declarative.ensureCurrentUser().then(() => { renderPage(); }); await loadCurrentFeed(); diff --git a/src/js/views/home.view.js b/src/js/views/home.view.js index 8e8fd014..08b7a0ee 100644 --- a/src/js/views/home.view.js +++ b/src/js/views/home.view.js @@ -284,7 +284,7 @@ class HomeView extends View { // Initial empty state renderPage(); - await dataLayer.declarations + await dataLayer.declarative .ensurePinnedFeedGenerators() .then((pinnedFeedGenerators) => { // If the current feed is not in the pinned feed generators, reset to default feed @@ -304,7 +304,7 @@ class HomeView extends View { // Ensure current user before loading feed to prevent flash of unfiltered feed if (isAuthenticated) { - await dataLayer.declarations.ensureCurrentUser(); + await dataLayer.declarative.ensureCurrentUser(); renderPage(); } await loadCurrentFeed(); diff --git a/src/js/views/notifications.view.js b/src/js/views/notifications.view.js index 96fa6adc..24950dfd 100644 --- a/src/js/views/notifications.view.js +++ b/src/js/views/notifications.view.js @@ -502,7 +502,7 @@ class NotificationsView extends View { root.addEventListener("page-enter", async () => { renderPage(); - dataLayer.declarations.ensureCurrentUser().then(() => { + dataLayer.declarative.ensureCurrentUser().then(() => { renderPage(); }); await loadNotifications({ reload: true }); diff --git a/src/js/views/postLikes.view.js b/src/js/views/postLikes.view.js index 30644e6d..6ccff1e0 100644 --- a/src/js/views/postLikes.view.js +++ b/src/js/views/postLikes.view.js @@ -138,12 +138,12 @@ class PostLikesView extends View { root.addEventListener("page-enter", async () => { renderPage(); if (isAuthenticated) { - dataLayer.declarations.ensureCurrentUser().then(() => { + dataLayer.declarative.ensureCurrentUser().then(() => { renderPage(); }); } // Load the post thread to get the post like count - dataLayer.declarations.ensurePostThread(postUri).then(() => { + dataLayer.declarative.ensurePostThread(postUri).then(() => { renderPage(); }); await loadLikes(); diff --git a/src/js/views/postQuotes.view.js b/src/js/views/postQuotes.view.js index 01e9c3ea..c7a6e334 100644 --- a/src/js/views/postQuotes.view.js +++ b/src/js/views/postQuotes.view.js @@ -148,12 +148,12 @@ class PostQuotesView extends View { root.addEventListener("page-enter", async () => { renderPage(); if (isAuthenticated) { - dataLayer.declarations.ensureCurrentUser().then(() => { + dataLayer.declarative.ensureCurrentUser().then(() => { renderPage(); }); } // Load the post thread to get the post quote count - dataLayer.declarations.ensurePostThread(postUri).then(() => { + dataLayer.declarative.ensurePostThread(postUri).then(() => { renderPage(); }); await loadQuotes(); diff --git a/src/js/views/postReposts.view.js b/src/js/views/postReposts.view.js index 31f9c762..cbe6af1a 100644 --- a/src/js/views/postReposts.view.js +++ b/src/js/views/postReposts.view.js @@ -138,12 +138,12 @@ class PostRepostsView extends View { root.addEventListener("page-enter", async () => { renderPage(); if (isAuthenticated) { - dataLayer.declarations.ensureCurrentUser().then(() => { + dataLayer.declarative.ensureCurrentUser().then(() => { renderPage(); }); } // Load the post thread to get the post repost count - dataLayer.declarations.ensurePostThread(postUri).then(() => { + dataLayer.declarative.ensurePostThread(postUri).then(() => { renderPage(); }); await loadReposts(); diff --git a/src/js/views/profile.view.js b/src/js/views/profile.view.js index d6dacbf6..6e33bddd 100644 --- a/src/js/views/profile.view.js +++ b/src/js/views/profile.view.js @@ -139,7 +139,7 @@ class ProfileView extends View { window.router.go(`/messages/${profileChatStatus.convo.id}`); } else { const convo = - await dataLayer.declarations.ensureConvoForProfile( + await dataLayer.declarative.ensureConvoForProfile( profile.did ); window.router.go(`/messages/${convo.id}`); @@ -306,9 +306,9 @@ class ProfileView extends View { root.addEventListener("page-enter", async () => { renderPage(); if (isAuthenticated) { - await dataLayer.declarations.ensureCurrentUser(); + await dataLayer.declarative.ensureCurrentUser(); } - const profile = await dataLayer.declarations.ensureProfile(profileDid); + const profile = await dataLayer.declarative.ensureProfile(profileDid); state.richTextProfileDescription = await loadProfileDescription(profile); renderPage(); if (!profile.viewer?.blocking) { diff --git a/src/js/views/profileFollowers.view.js b/src/js/views/profileFollowers.view.js index fa01d0ba..4039c291 100644 --- a/src/js/views/profileFollowers.view.js +++ b/src/js/views/profileFollowers.view.js @@ -146,11 +146,11 @@ class ProfileFollowersView extends View { root.addEventListener("page-enter", async () => { renderPage(); - dataLayer.declarations.ensureCurrentUser().then(() => { + dataLayer.declarative.ensureCurrentUser().then(() => { renderPage(); }); // Load the profile to get the follower count - dataLayer.declarations.ensureProfile(profileDid).then(() => { + dataLayer.declarative.ensureProfile(profileDid).then(() => { renderPage(); }); await loadFollowers(); diff --git a/src/js/views/profileFollowing.view.js b/src/js/views/profileFollowing.view.js index 0122ab5a..86dd41c6 100644 --- a/src/js/views/profileFollowing.view.js +++ b/src/js/views/profileFollowing.view.js @@ -140,11 +140,11 @@ class ProfileFollowingView extends View { root.addEventListener("page-enter", async () => { renderPage(); - dataLayer.declarations.ensureCurrentUser().then(() => { + dataLayer.declarative.ensureCurrentUser().then(() => { renderPage(); }); // Load the profile to get the follows count - dataLayer.declarations.ensureProfile(profileDid).then(() => { + dataLayer.declarative.ensureProfile(profileDid).then(() => { renderPage(); }); await loadFollowing(); diff --git a/src/js/views/search.view.js b/src/js/views/search.view.js index b4c5960e..10122e59 100644 --- a/src/js/views/search.view.js +++ b/src/js/views/search.view.js @@ -305,7 +305,7 @@ class SearchView extends View { } renderPage(); if (isAuthenticated) { - dataLayer.declarations.ensureCurrentUser().then(() => { + dataLayer.declarative.ensureCurrentUser().then(() => { renderPage(); }); } diff --git a/src/js/views/settings.view.js b/src/js/views/settings.view.js index 467270cb..f6d1ed1d 100644 --- a/src/js/views/settings.view.js +++ b/src/js/views/settings.view.js @@ -95,7 +95,7 @@ class SettingsView extends View { root.addEventListener("page-enter", async () => { // Initial empty state renderPage(); - dataLayer.declarations.ensureCurrentUser().then(() => { + dataLayer.declarative.ensureCurrentUser().then(() => { renderPage(); }); }); diff --git a/src/js/views/settings/appearance.view.js b/src/js/views/settings/appearance.view.js index 05501dee..8e7e47f9 100644 --- a/src/js/views/settings/appearance.view.js +++ b/src/js/views/settings/appearance.view.js @@ -135,7 +135,7 @@ class SettingsAppearanceView extends View { root.addEventListener("page-enter", async () => { // Initial empty state renderPage(); - dataLayer.declarations.ensureCurrentUser().then(() => { + dataLayer.declarative.ensureCurrentUser().then(() => { renderPage(); }); });