Merge branch 'dev' of github.com:fluxsocial/flux into dev

app/package.json

@@ -27,8 +27,8 @@
     "@coasys/flux-api": "*",
     "@coasys/flux-webrtc-view": "*",
     "@metamask/jazzicon": "^2.0.0",
-    "@perspect3vism/ad4m": "0.8.0-prerelease",
-    "@perspect3vism/ad4m-connect": "0.8.0-prerelease",
+    "@coasys/ad4m": "0.8.0-fix",
+    "@coasys/ad4m-connect": "0.8.0-fix",
     "construct-style-sheets-polyfill": "^3.1.0",
     "date-fns": "^2.29.3",
     "dexie": "^3.2.2",

app/src/__tests__/store/data/actions/showMessageNotifications.ts

@@ -3,7 +3,7 @@ import channel from "../../../fixtures/channel.json";
 import initAgentFixture from "../../../fixtures/initAgent.json";
 import getProfileFixture from "../../../fixtures/getProfile.json";
 import lockAgentFixture from "../../../fixtures/lockAgent.json";
-import { AgentStatus, Expression } from "@perspect3vism/ad4m";
+import { AgentStatus, Expression } from "@coasys/ad4m";
 import { ExpressionTypes, ProfileExpression } from "@/store/types";
 import { createPinia, Pinia, setActivePinia } from "pinia";
 import { useUserStore } from "@/store/user";

app/src/__tests__/store/user/actions/createUser.ts

@@ -1,6 +1,6 @@
 import initAgentFixture from "../../../fixtures/initAgent.json";
 import addPerspectiveFixture from "../../../fixtures/addPerspective.json";
-import { AgentStatus, PerspectiveHandle } from "@perspect3vism/ad4m";
+import { AgentStatus, PerspectiveHandle } from "@coasys/ad4m";
 import { createPinia, Pinia, setActivePinia } from "pinia";
 import { useUserStore } from "@/store/user";
 import { ad4mClient } from "@/app";

app/src/__tests__/store/user/actions/login.ts

@@ -1,6 +1,6 @@
 import "@testing-library/vue";
 import lockAgentFixture from "../../../fixtures/lockAgent.json";
-import { AgentStatus } from "@perspect3vism/ad4m";
+import { AgentStatus } from "@coasys/ad4m";
 import { createPinia, Pinia, setActivePinia } from "pinia";
 import { useUserStore } from "@/store/user";
 import { ad4mClient } from "@/app";

app/src/ad4mConnect.ts

@@ -1,4 +1,4 @@
-import Ad4mConnectUI from "@perspect3vism/ad4m-connect";
+import Ad4mConnectUI from "@coasys/ad4m-connect";
 
 const ad4mConnect = Ad4mConnectUI({
   appName: "Flux",

app/src/containers/CommunityMembers.vue

@@ -56,7 +56,7 @@
 <script lang="ts">
 import { defineComponent, watchEffect, ref } from "vue";
 import { Community, getProfile } from "@coasys/flux-api";
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 import Avatar from "@/components/avatar/Avatar.vue";
 import { usePerspective, useSubject } from "@coasys/flux-vue";
 import { useRoute } from "vue-router";

app/src/containers/CreateChannel.vue

@@ -129,7 +129,7 @@ import {
   getOfflineFluxApps,
 } from "@coasys/flux-api";
 import { usePerspective, useSubject } from "@coasys/flux-vue";
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 import { defineComponent } from "vue";
 import fetchFluxApp from "@/utils/fetchFluxApp";
 

app/src/containers/CreateCommunity.vue

@@ -210,8 +210,8 @@
 import { isValid } from "@/utils/validation";
 import { defineComponent, ref } from "vue";
 import AvatarUpload from "@/components/avatar-upload/AvatarUpload.vue";
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
-import { Ad4mClient, PerspectiveProxy } from "@perspect3vism/ad4m";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
+import { Ad4mClient, PerspectiveProxy } from "@coasys/ad4m";
 import { useAppStore } from "@/store/app";
 import { joinCommunity, createCommunity } from "@coasys/flux-api";
 import { usePerspectives, useCommunities } from "@coasys/flux-vue";

app/src/containers/EditChannel.vue

@@ -117,7 +117,7 @@ import {
 } from "@coasys/flux-api";
 import ChannnelViewOptions from "@/components/channel-view-options/ChannelViewOptions.vue";
 import { viewOptions } from "@/constants";
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 import { useSubjects, useSubject, usePerspective } from "@coasys/flux-vue";
 import { useRoute } from "vue-router";
 import fetchFluxApp from "@/utils/fetchFluxApp";

app/src/containers/EditCommunity.vue

@@ -46,7 +46,7 @@ import {
   resizeImage,
 } from "@coasys/flux-utils";
 import { useSubject, usePerspective } from "@coasys/flux-vue";
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 import { Community } from "@coasys/flux-api";
 
 export default defineComponent({

app/src/containers/EditProfile.vue

@@ -48,7 +48,7 @@ import { defineComponent } from "vue";
 import { useAppStore } from "@/store/app";
 import ImgUpload from "@/components/img-upload/ImgUpload.vue";
 import { useMe } from "@coasys/flux-vue";
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 import { getProfile, updateProfile } from "@coasys/flux-api";
 
 export default defineComponent({

app/src/store/types/userprofile.ts

@@ -1,5 +1,5 @@
-import { ExpressionGeneric } from "@perspect3vism/ad4m";
-import type { AgentStatus } from "@perspect3vism/ad4m";
+import { ExpressionGeneric } from "@coasys/ad4m";
+import type { AgentStatus } from "@coasys/ad4m";
 import { Profile } from "@coasys/flux-types";
 
 export interface UserState {

app/src/views/channel/ChannelView.vue

@@ -115,7 +115,7 @@
 
 <script lang="ts">
 import { defineComponent, ref, watch } from "vue";
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 import Profile from "@/containers/Profile.vue";
 import { useAppStore } from "@/store/app";
 import { ChannelView } from "@coasys/flux-types";
@@ -134,7 +134,7 @@ import {
   joinCommunity,
   generateWCName,
 } from "@coasys/flux-api";
-import { Ad4mClient } from "@perspect3vism/ad4m";
+import { Ad4mClient } from "@coasys/ad4m";
 import fetchFluxApp from "@/utils/fetchFluxApp";
 
 interface MentionTrigger {

app/src/views/community/CommunityView.vue

@@ -195,10 +195,10 @@ import { Channel, Community } from "@coasys/flux-api";
 import { ModalsState } from "@/store/types";
 import { useAppStore } from "@/store/app";
 import { mapActions } from "pinia";
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 import { useSubjects, useCommunities, usePerspectives } from "@coasys/flux-vue";
 import { usePerspective } from "@coasys/flux-vue";
-import { PerspectiveState } from "@perspect3vism/ad4m";
+import { PerspectiveState } from "@coasys/ad4m";
 
 type LoadedChannels = {
   [channelId: string]: boolean;

app/src/views/community/community-sidebar/ChannelList.vue

@@ -118,8 +118,8 @@ import { Channel } from "@coasys/flux-api";
 import { useSubjects, usePerspective, useMe } from "@coasys/flux-vue";
 import { ChannelView } from "@coasys/flux-types";
 import { viewOptions as channelViewOptions } from "@/constants";
-import { Ad4mClient } from "@perspect3vism/ad4m";
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { Ad4mClient } from "@coasys/ad4m";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 
 export default defineComponent({
   props: {

app/src/views/community/community-sidebar/Header.vue

@@ -100,9 +100,9 @@ import { mapActions } from "pinia";
 import { useAppStore } from "@/store/app";
 import Avatar from "@/components/avatar/Avatar.vue";
 import LoadingBar from "@/components/loading-bar/LoadingBar.vue";
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 import { useMe } from "@coasys/flux-vue";
-import { Ad4mClient } from "@perspect3vism/ad4m";
+import { Ad4mClient } from "@coasys/ad4m";
 
 export default defineComponent({
   components: { Avatar, LoadingBar },

app/src/views/community/community-sidebar/Members.vue

@@ -25,7 +25,7 @@ import AvatarGroup from "@/components/avatar-group/AvatarGroup.vue";
 import { mapActions } from "pinia";
 import { useAppStore } from "@/store/app";
 import { usePerspective } from "@coasys/flux-vue";
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 import { useRoute } from "vue-router";
 
 export default defineComponent({

app/src/views/main/MainView.vue

@@ -101,10 +101,10 @@ import { useAppStore } from "@/store/app";
 import { mapActions } from "pinia";
 import { DEFAULT_TESTING_NEIGHBOURHOOD } from "@/constants";
 import { EntryType } from "@coasys/flux-types";
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 import semver from "semver";
 import { dependencies } from "../../../package.json";
-import { LinkExpression, Literal, PerspectiveProxy } from "@perspect3vism/ad4m";
+import { LinkExpression, Literal, PerspectiveProxy } from "@coasys/ad4m";
 import { useSubject, usePerspective, usePerspectives } from "@coasys/flux-vue";
 import { Community } from "@coasys/flux-api";
 

app/src/views/main/main-sidebar/BottomSection.vue

@@ -30,7 +30,7 @@ import { useAppStore } from "@/store/app";
 import { mapActions, mapState } from "pinia";
 import Avatar from "@/components/avatar/Avatar.vue";
 import { useMe } from "@coasys/flux-vue";
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 
 export default defineComponent({
   components: {

app/src/views/main/main-sidebar/CommunitiesList.vue

@@ -53,7 +53,7 @@ import { useAppStore } from "@/store/app";
 import { defineComponent } from "vue";
 import Avatar from "@/components/avatar/Avatar.vue";
 import { usePerspectives, useCommunities } from "@coasys/flux-vue";
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 
 export default defineComponent({
   components: {

app/src/views/profile/Attestations.vue

@@ -21,7 +21,7 @@
 
 <script lang="ts">
 import { defineComponent, ref } from "vue";
-import { getAd4mClient } from "@perspect3vism/ad4m-connect";
+import { getAd4mClient } from "@coasys/ad4m-connect";
 import { useMe } from "@coasys/flux-vue";
 const EAS_LANG = "QmzSYwdiqjYXRAaoJdARpP7xRj4VQfdTT3J4HNGLohdKeuBgo1E";
 

app/src/views/profile/ProfileView.vue

@@ -190,7 +190,7 @@ import {
   EntanglementProof,
   LinkExpression,
   Literal,
-} from "@perspect3vism/ad4m";
+} from "@coasys/ad4m";
 import { defineComponent, ref } from "vue";
 import WebLinkCard from "./WebLinkCard.vue";
 import CommunityCard from "./CommunityCard.vue";
@@ -209,7 +209,7 @@ import {
   useMe,
 } from "@coasys/flux-vue";
 // @ts-ignore
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 import { useRoute } from "vue-router";
 import Attestations from "./Attestations.vue";
 // @ts-ignore

app/src/views/profile/WebLinkAdd.vue

@@ -59,7 +59,7 @@
 </template>
 
 <script lang="ts">
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 import { useAppStore } from "@/store/app";
 import { defineComponent, ref } from "vue";
 import { createAgentWebLink } from "@coasys/flux-api";

app/src/views/profile/WebLinkCard.vue

@@ -28,7 +28,7 @@
 </template>
 
 <script lang="ts">
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 import { getLiteralObjectLinks } from "@coasys/flux-utils";
 import { defineComponent } from "vue";
 export default defineComponent({

app/src/views/signup/SignUp.vue

@@ -66,7 +66,7 @@ import Carousel from "./SignUpCarousel.vue";
 import AvatarUpload from "@/components/avatar-upload/AvatarUpload.vue";
 import { useValidation } from "@/utils/validation";
 import ad4mLogo from "@/assets/images/ad4mLogo.svg";
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 import Logo from "@/components/logo/Logo.vue";
 import { useAppStore } from "@/store/app";
 import Ad4mLogo from "@/components/ad4m-logo/Ad4mLogo.vue";

docs/src/create-flux-plugin/basics/subjects.md

@@ -33,7 +33,7 @@ Defining your own models can be done by creating a new `SDNAClass`. The below sh
 ```ts
 // models/Todo.ts
 
-import { SDNAClass, subjectProperty, subjectFlag } from "@perspect3vism/ad4m";
+import { SDNAClass, subjectProperty, subjectFlag } from "@coasys/ad4m";
 
 @SDNAClass({
   name: "Todo",

docs/src/create-flux-plugin/getting-started/installation.md

@@ -25,7 +25,7 @@ If you'd rather use another framework, or just prefer to set everything up yours
 - 1: Initialize a new project and add the required packages:
 
 ```bash
-npx install @perspect3vism/ad4m-connect @perspect3vism/ad4m @coasys/flux-container
+npx install @coasys/ad4m-connect @coasys/ad4m @coasys/flux-container
 ```
 
 - 2: Wrap your Plugin in the flux-container web-component

packages/api/package.json

@@ -19,7 +19,7 @@
     "uuid": "^9.0.0"
   },
   "peerDependencies": {
-    "@perspect3vism/ad4m": "0.8.0-prerelease"
+    "@coasys/ad4m": "0.8.0-fix"
   },
   "keywords": [],
   "author": "",

packages/api/src/app/index.ts

@@ -1,6 +1,6 @@
 import { community } from "@coasys/flux-constants";
 import { EntryType } from "@coasys/flux-types";
-import { subjectProperty, SDNAClass, subjectFlag } from "@perspect3vism/ad4m";
+import { subjectProperty, SDNAClass, subjectFlag } from "@coasys/ad4m";
 
 const { DESCRIPTION, NAME, ENTRY_TYPE } = community;
 

packages/api/src/channel/index.ts

@@ -5,7 +5,7 @@ import {
   subjectCollection,
   SDNAClass,
   subjectFlag,
-} from "@perspect3vism/ad4m";
+} from "@coasys/ad4m";
 import App from "../app";
 
 const { FLUX_APP, NAME, ENTRY_TYPE } = community;

packages/api/src/community/index.ts

@@ -9,7 +9,7 @@ import {
   subjectProperty,
   subjectCollection,
   subjectFlag,
-} from "@perspect3vism/ad4m";
+} from "@coasys/ad4m";
 import Channel from "../channel";
 
 @SDNAClass({

packages/api/src/createAgentWebLink.ts

@@ -1,4 +1,4 @@
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 import { createLiteralObject } from "@coasys/flux-utils";
 import { profile } from "@coasys/flux-constants";
 import { WebLink } from "@coasys/flux-types";

packages/api/src/createCommunity.ts

@@ -1,7 +1,7 @@
 import { v4 as uuidv4 } from "uuid";
 import { Community as FluxCommunity } from "@coasys/flux-types";
-import { Ad4mClient, Perspective } from "@perspect3vism/ad4m";
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { Ad4mClient, Perspective } from "@coasys/ad4m";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 import {
   blobToDataURL,
   dataURItoBlob,

packages/api/src/createProfile.ts

@@ -5,9 +5,9 @@ import {
   Link,
   LinkExpression,
   LinkMutations,
-} from "@perspect3vism/ad4m";
+} from "@coasys/ad4m";
 import { Profile } from "@coasys/flux-types";
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 
 const { AD4M_AGENT, KAICHAO_AGENT, JUNTO_AGENT, NOTE_IPFS_AUTHOR } = agents;
 const { FILE_STORAGE_LANGUAGE } = languages;

packages/api/src/factory/SubjectRepository.ts

@@ -4,7 +4,7 @@ import {
   Subject,
   Literal,
   LinkQuery,
-} from "@perspect3vism/ad4m";
+} from "@coasys/ad4m";
 import { community } from "@coasys/flux-constants";
 import { setProperties } from "./model";
 import { v4 as uuidv4 } from "uuid";

packages/api/src/getAd4mProfile.ts

@@ -1,4 +1,4 @@
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 import { profile } from "@coasys/flux-constants";
 import { mapLiteralLinks } from "@coasys/flux-utils";
 

packages/api/src/getAgentLinks.ts

@@ -1,5 +1,5 @@
-import { LinkExpression } from "@perspect3vism/ad4m";
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { LinkExpression } from "@coasys/ad4m";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 
 export default async function getAgentLinks(
   did: string

packages/api/src/getAgentWebLinks.ts

@@ -1,5 +1,5 @@
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
-import { LinkExpression, Literal } from "@perspect3vism/ad4m";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
+import { LinkExpression, Literal } from "@coasys/ad4m";
 import { mapLiteralLinks } from "@coasys/flux-utils";
 import { profile } from "@coasys/flux-constants";
 import { WebLink } from "@coasys/flux-types";

packages/api/src/getMe.ts

@@ -1,5 +1,5 @@
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
-import { Ad4mClient, Perspective } from "@perspect3vism/ad4m";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
+import { Ad4mClient, Perspective } from "@coasys/ad4m";
 
 export type Me = {
   did: string;

packages/api/src/getPerspectiveMeta.ts

@@ -1,5 +1,5 @@
 import { findLink, getMetaFromLinks, keyedLanguages } from "@coasys/flux-utils";
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 
 export default async function getPerspectiveMeta(uuid: string) {
   const client = await getAd4mClient();

packages/api/src/getProfile.ts

@@ -1,8 +1,8 @@
 import { profile } from "@coasys/flux-constants";
 import { Profile } from "@coasys/flux-types";
 import { mapLiteralLinks } from "@coasys/flux-utils";
-import { Ad4mClient } from "@perspect3vism/ad4m";
-import { getAd4mClient } from "@perspect3vism/ad4m-connect/utils";
+import { Ad4mClient } from "@coasys/ad4m";
+import { getAd4mClient } from "@coasys/ad4m-connect/utils";
 
 const {
   HAS_USERNAME,