Merge branch 'develop' of https://github.com/PenguinMod/penguinmod.github.io into develop

Author: Ianyourgod

src/containers/extension-library.jsx

@@ -115,6 +115,7 @@ class ExtensionLibrary extends React.PureComponent {
             return;
         }
         // load the extension like any other custom extension url (this means sandboxing for some urls)
+        console.log("Received request to load", extensionId, "from", e.origin);
         if (this.props.vm.extensionManager.isExtensionLoaded(extensionId)) {
             this.props.onCategorySelected(extensionId);
             // i mean, technically we succeeded
@@ -171,7 +172,7 @@ class ExtensionLibrary extends React.PureComponent {
             return;
         }
         if (extensionId === 'special_penguinmodExtensionLibrary') {
-            window.open('https://extensions.penguinmod.com/');
+            window.open('https://extensions.penguinmod.com/?editor=true');
             return;
         }
         const url = (item.extensionURL ? item.extensionURL : extensionId);

src/lib/is-safari.js

@@ -0,0 +1,7 @@
+// taken from the packager so this should be accurate?
+const isSafari = () =>
+    !navigator.userAgentData &&
+    /Safari\//.test(navigator.userAgent) &&
+    !/Chrom(e|ium)\//.test(navigator.userAgent);
+
+export default isSafari;

src/lib/libraries/extensions/index.jsx

@@ -1125,7 +1125,7 @@ const menuItems = [
                 id="pm.extraLibraryExtensions.name"
             />
         ),
-        href: 'https://extensions.penguinmod.com/',
+        href: 'https://extensions.penguinmod.com/?editor=true',
         extensionId: 'special_penguinmodExtensionLibrary',
         iconURL: penguinmodLibraryExtensionIcon,
         description: (

src/lib/pm-mature-fs-available.js

@@ -0,0 +1,20 @@
+/**
+ * @fileoverview Module to help determine how much of the file-system APIs can be used.
+ * NOTE: This module is meant to help with a few things,
+ * 1. Recognize that Chrome on Desktop should support everything
+ * 2. Tell if a browser (like Firefox & Safari) is missing File System Access API
+ * 3. State if the browser is known to be extremely bad at supporting the file type filters (mobile browsers + Safari on all platforms)
+ */
+import { isMobile } from './pm-mobile';
+import isSafari from './is-safari';
+
+// NOTE: handles point 1 & 2
+const isApiAvailable = () => !!window.showSaveFilePicker;
+
+// NOTE: handles point 3
+const isTypeFilterAvailable = () => !(isMobile() || isSafari());
+
+export {
+    isApiAvailable,
+    isTypeFilterAvailable,
+};

src/lib/sb-file-uploader-hoc.jsx

@@ -6,7 +6,7 @@ import {connect} from 'react-redux';
 import log from '../lib/log';
 import sharedMessages from './shared-messages';
 import FileSystemAPI from './tw-filesystem-api';
-import {isMobile} from './pm-mobile';
+import {isTypeFilterAvailable} from './pm-mature-fs-available';
 import {setFileHandle} from '../reducers/tw';
 import JSZip from 'jszip';
 
@@ -109,8 +109,8 @@ const SBFileUploaderHOC = function (WrappedComponent) {
                 // create <input> element and add it to DOM
                 this.inputElement = document.createElement('input');
 
-                // pm: Some bad mobile devices block any file type (iOS)
-                if (!isMobile()) {
+                // pm: Some bad browsers block any file type (Safari) so we need to only add .accept for those which can handle it properly
+                if (isTypeFilterAvailable()) {
                     this.inputElement.accept = '.sb,.sb2,.sb3,.pm,.pmp';
                 }
 

src/lib/tw-filesystem-api.js

@@ -1,11 +1,11 @@
-import { isMobile } from './pm-mobile';
+import { isApiAvailable, isTypeFilterAvailable } from './pm-mature-fs-available';
 
-const available = () => !!window.showSaveFilePicker;
+const available = isApiAvailable;
 
 // pm: Some bad mobile devices block any file type (iOS), so these funcs should allow all files on mobile
 const showSaveFilePicker = fileName => window.showSaveFilePicker({
     suggestedName: fileName,
-    ...(isMobile() ? {} : {
+    ...(!isTypeFilterAvailable() ? {} : {
         types: [
             {
                 description: 'PenguinMod Project',
@@ -21,7 +21,7 @@ const showSaveFilePicker = fileName => window.showSaveFilePicker({
 const showOpenFilePicker = async () => {
     const [handle] = await window.showOpenFilePicker({
         multiple: false,
-        ...(isMobile() ? {} : {
+        ...(!isTypeFilterAvailable() ? {} : {
             types: [
                 {
                     description: 'Supported Files',

src/playground/credits/users.js

@@ -182,6 +182,11 @@ const pmPullRequestDevelopers = [ // these people made a PR that got merged, or
         image: `https://github.com/NotEmbin.png`,
         href: `https://github.com/NotEmbin/`,
     },
+    {
+        text: 'ddededodediamante',
+        image: `https://github.com/ddededodediamante.png`,
+        href: `https://github.com/ddededodediamante/`,
+    },
     {  // rx or ry single fix
         text: 'NotCryptid',
         image: `https://penguinmod.com/unknown_user.png`,
@@ -955,7 +960,8 @@ const pmExtensionDevelopers = [
     'oc9x97',
     'lego7set',
     'mariocraft987',
-    'AshimeeAlt'
+    'AshimeeAlt',
+    'ddededodediamante'
 ].map(fromHardcodedGithub);
 
 const pmCodeUsedFrom = [