Merge remote-tracking branch 'pm/develop' into merge-upstream

Snail-IDE · Dec 8, 2024 · d261f3d · d261f3d
2 parents 5d0f07a + ce7db9e
commit d261f3d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 23 deletions.
diff --git a/src/components/tw-studioview/studioview.jsx b/src/components/tw-studioview/studioview.jsx
@@ -60,6 +60,11 @@ class StudioViewComponent extends React.Component {
     }
     handleSelect (id) {
         this.props.onSelect(id);
+        /**
+         * fuck this bullshity ass design paradigm, i cant find where the FUCK this event chain actually ends
+         * implicitly assume that what ever the fuck happens above will synchronously put the id into the url to be used later
+         */
+        window.location.reload();
     }
     ref (el) {
         this.el = el;

diff --git a/src/lib/tw-project-meta-fetcher-hoc.jsx b/src/lib/tw-project-meta-fetcher-hoc.jsx
@@ -122,31 +122,27 @@ const TWProjectMetaFetcherHOC = function (WrappedComponent) {
                             new Date(rawData.date),
                             rawData.updating === true
                         );
-                    }
-                    if (rawData.remix > 0) {
-                        // this is a remix, find the original project
-                        fetchProjectMeta(rawData.remix)
-                            .then(remixProject => {
-                                // If project ID changed, ignore the results.
-                                if (this.props.projectId !== projectId) {
-                                    return;
-                                }
-                                // If this project is hidden or not approved, ignore the results.
-                                if (
-                                    typeof remixProject.name === 'string'
-                                    || typeof remixProject.owner === 'string'
-                                ) {
+
+                        if (String(rawData.remix) !== '0') {
+                            // this is a remix, find the original project
+                            fetchProjectMeta(rawData.remix)
+                                .then(remixProject => {
+                                    // If project ID changed, ignore the results.
+                                    if (this.props.projectId !== projectId) {
+                                        return;
+                                    }
+
                                     this.props.onSetRemixedProjectInfo(
                                         true, // loaded
-                                        remixProject.name,
-                                        remixProject.owner
+                                        remixProject.title,
+                                        remixProject.author.username
                                     );
-                                }
-                            })
-                            .catch(err => {
-                                // this isnt fatal, just log
-                                log.warn('cannot fetch remixed project meta for this project;', err);
-                            });
+                                })
+                                .catch(err => {
+                                    // this isnt fatal, just log
+                                    log.warn('cannot fetch remixed project meta for this project;', err);
+                                });
+                        }
                     }
                     setIndexable(true);
                 })

diff --git a/src/playground/addon-settings.jsx b/src/playground/addon-settings.jsx
@@ -22,7 +22,7 @@ import appTarget from './app-target';
 
 const onExportSettings = settings => {
     const blob = new Blob([JSON.stringify(settings)]);
-    downloadBlob('turbowarp-addon-settings.json', blob);
+    downloadBlob('penguinmod-addon-settings.json', blob);
 };
 
 ReactDOM.render((