short form dna now integrates with acai much more closely by storing …

…did & signature information

src/languages/junto-hc-shortform/adapter.ts

@@ -1,4 +1,5 @@
 import type Address from '../../acai/Address'
+import type AgentService from '../../acai/AgentService'
 import Agent from '../../acai/Agent'
 import type Expression from '../../acai/Expression'
 import type { ExpressionAdapter, GetByAuthorAdapter, PublicSharing } from '../../acai/Language'
@@ -8,18 +9,21 @@ import { DNA_NICK } from './dna'
 import blake2b from 'blake2b'
 
 class ShortFormPutAdapter implements PublicSharing {
+    #agent: AgentService
     #shortFormDNA: HolochainLanguageDelegate
 
     constructor(context: LanguageContext) {
+        this.#agent = context.agent
         this.#shortFormDNA = context.Holochain as HolochainLanguageDelegate
     }
 
     async createPublic(shortForm: object): Promise<Address> {
         //@ts-ignore
         let obj = JSON.parse(shortForm)
+        const expression = this.#agent.createSignedExpression(shortForm)
 
-        let res = await this.#shortFormDNA.call(DNA_NICK, "shortform", "create_public_expression", {content: JSON.stringify(obj)});
-        return res.expression.signed_header.header.hash.toString('hex');
+        let res = await this.#shortFormDNA.call(DNA_NICK, "shortform", "create_public_expression", expression);
+        return res.holochain_data.element.signed_header.header.hash.toString('hex');
     }
 }
 
@@ -34,21 +38,12 @@ export default class ShortFormAdapter implements ExpressionAdapter {
     }
 
     async get(address: Address): Promise<void | Expression> {
-        console.log("Getting at address", address);
-        var output = new Uint8Array(35)
-        let hash = blake2b(output.length).update(address).digest();
-        console.log("Getting hash", hash);
-        console.log("Hash to string", hash.toString('hex'));
-        let expression = await this.#shortFormDNA.call(DNA_NICK, "shortform", "get_expression_by_address", { address });
-
-        if (expression.entry.Present != undefined) {
-            return {
-                //Might need to resolve creator to did information
-                author: new Agent(expression.creator),
-                timestamp: expression.created_at,
-                data: JSON.parse(expression),
-                proof: undefined
-            }
+        let hash = Buffer.from(address, 'hex');
+        let expression = await this.#shortFormDNA.call(DNA_NICK, "shortform", "get_expression_by_address", hash);
+        if (expression != null) {
+            console.log("Got expression====", expression);
+            let acai_expression: Expression = Object.assign(expression.expression_data)
+            return acai_expression
         } else {
             return null
         }
@@ -59,7 +54,7 @@ export default class ShortFormAdapter implements ExpressionAdapter {
         //@ts-ignore
         let obj = JSON.parse(content)
 
-        this.#shortFormDNA.call(DNA_NICK, "shortform", "send_private", {to: to, content: JSON.stringify(obj)});
+        this.#shortFormDNA.call(DNA_NICK, "shortform", "send_private", {to: to, data: JSON.stringify(obj)});
     }
 
     /// Get private expressions sent to you
@@ -72,7 +67,6 @@ export default class ShortFormAdapter implements ExpressionAdapter {
         let out = [];
         res.forEach(expression => {
             out.push({
-                //Might need to resolve creator to did information
                 author: new Agent(expression.creator),
                 timestamp: expression.created_at,
                 data: JSON.parse(expression),