Merge pull request #222 from fluxsocial/dev

jdeepee · web-flow · commit a18b7292027b · 2022-02-07T18:03:35.000Z
v0.2.16
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -39,8 +39,8 @@ jobs:
           PKG_CONFIG_PATH: "/usr/local/opt/openssl/lib/pkgconfig"
         run: |
           cargo install lair_keystore --git https://github.com/guillemcordoba/lair --rev 8c0a3683d93540301af53688ea431c7cc0beb438
-          cargo install --locked holochain --git https://github.com/holochain/holochain.git --tag holochain-0.0.123
-          cargo install holochain_cli --version 0.0.24
+          cargo install --locked holochain --git https://github.com/holochain/holochain.git --tag holochain-0.0.125
+          cargo install holochain_cli --version 0.0.26
           ./scripts/copy-hc.sh
       - name: Cache cargo registry
         uses: actions/cache@v1
@@ -157,8 +157,8 @@ jobs:
           SQLCIPHER_STATIC: 1
         run: |
           cargo install lair_keystore --git https://github.com/guillemcordoba/lair --rev 8c0a3683d93540301af53688ea431c7cc0beb438
-          cargo install --locked holochain --git https://github.com/holochain/holochain.git --tag holochain-0.0.123
-          cargo install holochain_cli --version 0.0.24
+          cargo install --locked holochain --git https://github.com/holochain/holochain.git --tag holochain-0.0.125
+          cargo install holochain_cli --version 0.0.26
           ./scripts/copy-hc.sh
       - name: Cache cargo registry
         uses: actions/cache@v1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,36 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).  
 This project *loosely* adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). More specifically:
 
+## [0.2.16] - 07/02/2022
+
+### Added 
+ - Ability to copy Flux logs from splash screen 
+ - caching on expressions @ ad4m-executor where language is immutable
+ - added CAL 
+
+### Changed
+ - Using holochain version 0.0.125
+ - replies and emojis are loaded async after initial message load to reduce loading time
+ - use indexdb for profile storage to avoid filling localStorage
+ - only fetch 35 messages per page
+
+### Deprecated
+
+### Removed
+ - Many un-used dependencies
+
+### Fixed
+ - Notifications working again
+ - ad4m-executor will now check which port to use when starting gql server to avoid collisions
+ - fixed bug where name for communities could all become the same
+ - members name not being present when making a reply
+ - various bugs with the handling of emojis on a message
+ - error when channel views would sometimes not load correctly
+
+### Security
+
+---
+
 ## [0.2.15] - 23/01/2022
 
 ### Added 
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -18,20 +18,20 @@ cachix use holochain-ci
 Installing dependencies for flux and compiling holochain can be done with:
 
 ```
-npm install && npm run get-languages && npm run build-holochain
+yarn install && yarn run get-languages && yarn run build-holochain
 ```
 
 ### Compiles and hot-reloads for development
 ```
-npm run electron:serve
+yarn run electron:serve
 ```
 
 ## Cleaning local state
 
 The following commands will remove all installed ad4m languages (except defaults), holochain DNA's, ad4m did store & vuex store.
 
 ```
-npm run clean-state
+yarn run clean-state
 ```
 
 ## Holochain DNA's
@@ -50,10 +50,10 @@ These DNA's come bundled with the builtin languages, links above are provided fo
 
 ### Compiles and minifies for production
 ```
-npm run build-holochain && npm run get-languages && npm run electron:build
+yarn run build-holochain && yarn run get-languages && yarn run electron:build
 ```
 
 ### Lints and fixes files
 ```
-npm run lint
+yarn run lint
 ```
diff --git a/default.nix b/default.nix
@@ -1,5 +1,5 @@
 {
-  holonixPath ?  builtins.fetchTarball { url = "https://github.com/holochain/holonix/archive/2f7b8047d6314f64fca34394a52d465c18b2f4d5.tar.gz"; }
+  holonixPath ?  builtins.fetchTarball { url = "https://github.com/holochain/holonix/archive/99fbe2026e774b29b265f81bf68a9cf0b21b31c3.tar.gz"; }
 }:
 
 let
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "flux",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "private": true,
   "description": "A social web3 tool kit for communities",
   "author": "josh@junto.foundation",
@@ -26,29 +26,23 @@
   "dependencies": {
     "@apollo/client": "3.4.17",
     "@junto-foundation/junto-elements": "^0.4.0",
-    "@perspect3vism/ad4m": "0.1.24",
-    "@perspect3vism/ad4m-executor": "0.1.30",
-    "@tiptap/vue-3": "^2.0.0-beta.45",
+    "@perspect3vism/ad4m": "0.1.25",
+    "@perspect3vism/ad4m-executor": "0.1.32",
     "core-js": "^3.15.2",
     "date-fns": "^2.22.1",
-    "datocms-structured-text-utils": "^1.2.0",
     "electron-updater": "^4.3.9",
+    "get-port": "^5.1.1",
     "graphql": "^15.5.0",
-    "idb": "^6.1.4",
     "level": "^7.0.1",
     "nanoid": "^3.1.30",
     "patch-package": "^6.4.7",
     "pinia": "^2.0.2",
-    "register-service-worker": "^1.7.1",
     "sass": "^1.49.0",
     "subscriptions-transport-ws": "^0.9.19",
     "uuid": "^8.3.2",
     "vue": "^3.0.0",
-    "vue-advanced-cropper": "^2.3.1",
-    "vue-datocms": "^1.0.3",
     "vue-router": "^4.0.0-0",
-    "vue-virtual-scroller": "^2.0.0-alpha.1",
-    "fs-extra": "^10.0.0"
+    "vue-advanced-cropper": "^2.3.1"
   },
   "devDependencies": {
     "@babel/plugin-transform-runtime": "^7.14.5",
diff --git a/public/loading.html b/public/loading.html
@@ -26,6 +26,14 @@
       height: 100vh;
       width: 100vw;
     }
+
+    .error {
+      padding: 40px 80px;
+      visibility: collapse;
+      opacity: 0;
+      transition: visibility 0s, opacity 0.5s linear, height 1s;
+      height: 0;
+    }
   </style>
   <body>
     <div class="main">
@@ -52,6 +60,40 @@
           fill="var(--j-color-black)"
         />
       </svg>
+      <div class="error">
+        <j-flex a="center" direction="column" gap="900">
+          <j-text nomargin variant="heading-lg"
+            >Whoops, something broke! 😅</j-text
+          >
+          <j-text nomargin variant="subheading">
+            If you have also been asked to include a log file with your report,
+            click the button below to copy a log file to your desktop:
+          </j-text>
+          <j-button onclick="copyFile()" variant="primary">Copy</j-button>
+        </j-flex>
+      </div>
     </div>
   </body>
+  <script>
+    setTimeout(() => {
+      const error = document.getElementsByClassName('error');
+      error[0].style.display = 'block'
+      error[0].style.visibility = 'visible'
+      error[0].style.opacity = 1
+      error[0].style.height = '160px'
+    }, 30000);
+
+    function copyFile() {
+      const button = document.getElementsByTagName('j-button');
+      window.api.send("copyLogs");
+
+      setTimeout(() => {
+        button[0].innerHTML = 'Copied'
+
+        setTimeout(() => {
+          button[0].innerHTML = 'Copy'
+        }, 2000);
+      }, 500);
+    }
+  </script>
 </html>
diff --git a/src/App.vue b/src/App.vue
@@ -144,7 +144,18 @@ export default defineComponent({
       perspective: string
     ) => {
       console.debug("GOT INCOMING MESSAGE SIGNAL", link, perspective);
-      if (link.data!.predicate! === MEMBER) {
+      if (link.data!.predicate! === EXPRESSION) {
+        expressionWorker.postMessage({
+          id: link.data!.target!,
+          retry: expressionGetRetries,
+          callbackData: { perspective, link },
+          interval: expressionGetDelayMs,
+          query: print(GET_EXPRESSION),
+          variables: { url: link.data!.target! },
+          name: "Expression signal get",
+          dataKey: "expression",
+        });
+      } else if (link.data!.predicate! === MEMBER) {
         const did = link.data!.target!.split("://")[1];
         console.log("Got new member in signal! Parsed out did: ", did);
         if (did) {
diff --git a/src/__tests__/store/app/actions/updateCommunityTheme.ts b/src/__tests__/store/app/actions/updateCommunityTheme.ts
@@ -118,7 +118,7 @@ describe("Update community theme", () => {
       expect(error).toBeInstanceOf(Error);
       expect(error).toHaveProperty(
         "message",
-        `Cannot read property 'theme' of undefined`
+        `Cannot read properties of undefined (reading 'theme')`
       );
     }
 
diff --git a/src/constants/agents.ts b/src/constants/agents.ts
@@ -1,5 +1,5 @@
 export const JUNTO_AGENT =
-  "did:key:zQ3shbBYwqHtBMXfe96MN5YVDvZPLLC87EFAPL9SnoqLDd9Jm";
+  "did:key:zQ3sheV6m6sT83woZtVL2PHiz6J1qWRh4FWW2aiJvxy6d2o7S";
 
 export const AD4M_AGENT =
   "did:key:zQ3shkkuZLvqeFgHdgZgFMUx8VGkgVWsLA83w2oekhZxoCW2n";
diff --git a/src/constants/languages.ts b/src/constants/languages.ts
@@ -1,14 +1,14 @@
 export const SOCIAL_CONTEXT_OFFICIAL =
-  "QmfDoeJgiG5Hs4DJcwPqDWbwU2Ks8zLSJjv7bR8is84Qt5";
+  "QmbCKYo6fWgEP7PiqoYH1jKiJHWFCnGUmwxDfUUEjXQvXB";
 
 export const GROUP_EXPRESSION_OFFICIAL =
-  "QmXVGtL3dSV6kDqXPMniZx4Gn9qZfoh9HoW8vWTspVe7r6";
+  "QmR1WN8Xo9iExE5E7o42CEmSx3yXo8Eak8hWka39VTChRN";
 
 export const PROFILE_EXPRESSION_OFFICIAL =
-  "QmdBmy37AxY9wMVKayJYjEr23iDc6uWntKSp3P3BzCxVjq";
+  "QmUdRBhq2FPz89e8KTZPoHKrPE2AhDRPrPEeov3BU44gtb";
 
 export const SHORTFORM_EXPRESSION_OFFICIAL =
-  "QmPyHuezrCdbrL1HjSzMq1o2DhUCoPq36xhuYytHnsCunB";
+  "QmZwtqabEkh1hbnFTNc12ipkhbkxEzT2QucVXyd1CQLEYK";
 
 export const NOTE_IPFS_EXPRESSION_OFFICIAL =
   "QmYVsrMpiFmV9S7bTWNAkUzSqjRJskQ8g4TWKKwKrHAPqL";
diff --git a/src/containers/Profile.vue b/src/containers/Profile.vue
@@ -64,7 +64,9 @@ export default defineComponent({
         const bioLink = profilePerspective.perspective?.links.find(
           (e) => e.data.predicate === "sioc://has_bio"
         ) as LinkExpression;
-        this.bio = bioLink.data.target.split("://")[1];
+        if (bioLink) {
+          this.bio = bioLink.data.target.split("://")[1];
+        }
       },
       immediate: true,
     },
diff --git a/src/main-thread/appHooks.ts b/src/main-thread/appHooks.ts
@@ -6,11 +6,12 @@ import ad4m from "@perspect3vism/ad4m-executor";
 import { autoUpdater } from "electron-updater";
 import { MainThreadGlobal } from "./globals";
 import { createMainWindow, createSplashScreen } from "./createUI";
+import getPort from "get-port";
 
 export function registerAppHooks(mainThreadState: MainThreadGlobal): void {
-  if (!fs.existsSync(path.join(app.getPath("userData"), "dontDelete-0.2.15"))) {
+  if (!fs.existsSync(path.join(app.getPath("userData"), "dontDelete-0.2.16"))) {
     console.warn(
-      "Did not find dontDelete-0.2.15 deleting ad4m and Local Storage directories"
+      "Did not find dontDelete-0.2.16 deleting ad4m and Local Storage directories"
     );
     const ad4mPath = path.join(app.getPath("userData"), "ad4m");
     if (fs.existsSync(ad4mPath)) fs.rmSync(ad4mPath, { recursive: true });
@@ -22,9 +23,9 @@ export function registerAppHooks(mainThreadState: MainThreadGlobal): void {
     if (fs.existsSync(localStoragePath))
       fs.rmSync(localStoragePath, { recursive: true });
 
-    fs.mkdirSync(path.join(app.getPath("userData"), "dontDelete-0.2.15"));
+    fs.mkdirSync(path.join(app.getPath("userData"), "dontDelete-0.2.16"));
   } else {
-    console.warn("Found dontDelete-0.2.15, skipping deletion of config");
+    console.warn("Found dontDelete-0.2.16, skipping deletion of config");
   }
 
   // This method is called if a second instance of the application is started
@@ -130,13 +131,14 @@ export function registerAppHooks(mainThreadState: MainThreadGlobal): void {
               },
             ],
             neighbourhoods: [],
-            perspectives: []
+            perspectives: [],
           },
           appBuiltInLangs: ["direct-message-language", "lang-note-ipfs"],
           appLangAliases: null,
           mocks: false,
           // @ts-ignore
           runDappServer: true,
+          gqlPort: await getPort({ port: 4000 }),
         })
         .then(async (ad4mCore: ad4m.PerspectivismCore) => {
           mainThreadState.ad4mCore = ad4mCore;
diff --git a/src/main-thread/createUI.ts b/src/main-thread/createUI.ts
@@ -84,6 +84,7 @@ export function createSplashScreen(mainThreadState: MainThreadGlobal): void {
       nodeIntegration: false,
       contextIsolation: true, // protect against prototype pollution
       enableRemoteModule: false,
+      preload: path.join(__dirname, "preload.js"), // use a preload script
     },
     minimizable: false,
     alwaysOnTop: false,
diff --git a/src/store/data/actions/fetchNeighbourhoodMetadata.ts b/src/store/data/actions/fetchNeighbourhoodMetadata.ts
@@ -43,6 +43,7 @@ export default async (communityId: string): Promise<void> => {
       variables: {
         url: sortedLinks[sortedLinks.length - 1].data!.target!,
       },
+      callbackData: { communityId: community.neighbourhood.perspective.uuid },
       name: "Get group expression data",
       dataKey: "expression",
     });
@@ -57,13 +58,13 @@ export default async (communityId: string): Promise<void> => {
       console.log("Got new group expression data for community", groupExpData);
       //Update the community with the new group data
       dataStore.updateCommunityMetadata({
-        communityId: community.neighbourhood.perspective.uuid,
+        communityId: e.data.callbackData.communityId, 
         name: groupExpData["name"],
         description: groupExpData["description"],
         image: groupExpData["image"],
         thumbnail: groupExpData["thumnail"],
         groupExpressionRef:
-          groupExpressionLinks[groupExpressionLinks.length - 1].data!.target,
+          sortedLinks[sortedLinks.length - 1].data!.target,
       });
     });
   }
diff --git a/src/store/data/actions/getNeighbourhoodChannels.ts b/src/store/data/actions/getNeighbourhoodChannels.ts
@@ -30,6 +30,7 @@ export default async ({ communityId }: Payload): Promise<Worker> => {
           predicate: "sioc://has_space",
         }),
       },
+      callbackData: { communityId: community.neighbourhood.perspective.uuid },
       name: `Channel links for ${community.neighbourhood.name}`,
       dataKey: "perspectiveQueryLinks",
     });
@@ -43,23 +44,23 @@ export default async ({ communityId }: Payload): Promise<Worker> => {
       try {
         const channelLinks = e.data.perspectiveQueryLinks;
 
-      console.log(channelLinks);
+        console.log(channelLinks);
 
         for (let i = 0; i < channelLinks.length; i++) {
           //Check that the channel is not in the store
           if (
             Object.values(community.neighbourhood.linkedNeighbourhoods).find(
               (neighbourhoodUrl) =>
                 neighbourhoodUrl === channelLinks[i].data!.target
-            ) == undefined
+            ) === undefined
           ) {
             console.log(
               "Found channel link from un-joined channel neighbourhood",
               channelLinks[i]
             );
             //Call ad4m and try to join the sharedperspective found at link target
             await dataStore.joinChannelNeighbourhood({
-              parentCommunityId: community.neighbourhood.perspective.uuid,
+              parentCommunityId: e.data.callbackData.communityId,
               neighbourhoodUrl: channelLinks[i].data!.target,
             });
           }
diff --git a/src/views/channel-view/ChannelView.vue b/src/views/channel-view/ChannelView.vue
@@ -1,7 +1,6 @@
 <template>
   <chat-view
     :perspective-uuid="channel.neighbourhood.perspective.uuid"
-    :source-perspective-uuid="community.neighbourhood.perspective.uuid"
     @agent-click="onAgentClick"
     @perspective-click="onPerspectiveClick"
     @hide-notification-indicator="onHideNotificationIndicator"
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- holonixPath ? builtins.fetchTarball { url = "https://github.com/holochain/holonix/archive/2f7b8047d6314f64fca34394a52d465c18b2f4d5.tar.gz"; }`
	`2`	`+ holonixPath ? builtins.fetchTarball { url = "https://github.com/holochain/holonix/archive/99fbe2026e774b29b265f81bf68a9cf0b21b31c3.tar.gz"; }`
`3`	`3`	`}:`
`4`	`4`
`5`	`5`	`let`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ describe("Update community theme", () => {`
`118`	`118`	`expect(error).toBeInstanceOf(Error);`
`119`	`119`	`expect(error).toHaveProperty(`
`120`	`120`	`"message",`
`121`		- `Cannot read property 'theme' of undefined`
	`121`	+ `Cannot read properties of undefined (reading 'theme')`
`122`	`122`	`);`
`123`	`123`	`}`
`124`	`124`