Merge branch 'wordplaydev:main' into 378-translate-the-verse

wordplaydev · Aug 18, 2024 · ec4a1ca · ec4a1ca
2 parents a8cc819 + 3b4b515
commit ec4a1ca
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@
 We'll note all notable changes in this file, including bug fixes, enhancements, and all closed issues.
 Dates are in `YYYY-MM-DD` format and versions are in [semantic versioning](http://semver.org/) format.
 
+## 0.10.10 2024-08-12
+
+### Fixed
+
+-   [#550](https://github.com/wordplaydev/wordplay/issues/550) Ensure owned projects are marked as owned when loaded directly from Firestore.
+
 ## 0.10.9 2024-08-10
 
 ### Added

diff --git a/src/db/ProjectsDatabase.ts b/src/db/ProjectsDatabase.ts
@@ -182,7 +182,7 @@ export default class ProjectsDatabase {
             this.projectsQueryUnsubscribe = undefined;
         }
 
-        // If there's no more user, stop le, do nothing.
+        // If there's no more user, do nothing.
         if (user === null) return;
 
         // Set up the realtime projects query for the user, tracking any projects from the cloud,
@@ -430,11 +430,13 @@ export default class ProjectsDatabase {
                     doc(firestore, ProjectsCollection, id),
                 );
                 if (projectDoc.exists()) {
+                    const user = this.database.getUser();
+
                     const project = await this.parseProject(projectDoc.data());
                     if (project !== undefined)
                         this.track(
                             project,
-                            false,
+                            user !== null && project.getOwner() === user.uid,
                             PersistenceType.Online,
                             false,
                         );

diff --git a/src/routes/project/[projectid]/+page.svelte b/src/routes/project/[projectid]/+page.svelte
@@ -50,19 +50,20 @@
                     // See if the project is editable, and if so, get it's store, so we can track it's changes.
                     const projectStore = Projects.getStore(projectID);
                     if (projectStore) {
+                        // Mark the project editable, since there's a store for it.
                         editable = true;
+                        // If there's a different store, stop listening to the current store and listen to the new one.
                         if (store !== projectStore) {
                             // Unsubscribe from the previous store
                             if (unsub) unsub();
-                            // Mark the project editable.
                             // Remember the new store
                             store = projectStore;
                             // Update the project we're showing whenever it changes.
                             unsub = store.subscribe((proj) => {
                                 project = proj;
                                 overwritten =
                                     Projects.getHistory(
-                                        proj.getID()
+                                        proj.getID(),
                                     )?.wasOverwritten() ?? false;
                             });
                         }