Notify proposal changes in general chatroom

frontend/controller/actions/group.js

@@ -876,20 +876,17 @@ export default (sbp('sbp/selectors/register', {
     const rootState = sbp('state/vuex/state')
     const { generalChatRoomId } = rootState[params.contractID]
 
-    for (const proposal of proposals) {
+    for (let i = 0; i < proposals.length; i++) {
+      const isLastProposal = i === proposals.length - 1
       await sbp('gi.actions/chatroom/addMessage', {
-        ...omit(params, ['options', 'contractID', 'data', 'hooks']),
         contractID: generalChatRoomId,
         data: {
           type: MESSAGE_TYPES.INTERACTIVE,
-          proposal: {
-            ...proposal,
-            variant: STATUS_EXPIRING
-          }
+          proposal: { ...proposals[i], status: STATUS_EXPIRING }
         },
         hooks: {
-          prepublish: params.hooks?.prepublish,
-          postpublish: null
+          prepublish: null,
+          postpublish: isLastProposal ? params.hooks?.postpublish : null
         }
       })
     }

frontend/controller/actions/identity-kv.js

@@ -25,10 +25,13 @@ export default (sbp('sbp/selectors/register', {
     if (!ourIdentityContractId) {
       throw new Error('Unable to update chatroom unreadMessages without an active session')
     }
-    return sbp('chelonia/kv/set', ourIdentityContractId, KV_KEYS.UNREAD_MESSAGES, data, {
-      encryptionKeyId: sbp('chelonia/contract/currentKeyIdByName', ourIdentityContractId, 'cek'),
-      signingKeyId: sbp('chelonia/contract/currentKeyIdByName', ourIdentityContractId, 'csk'),
-      onconflict
+
+    return sbp('chelonia/queueInvocation', ourIdentityContractId, () => {
+      return sbp('chelonia/kv/set', ourIdentityContractId, KV_KEYS.UNREAD_MESSAGES, data, {
+        encryptionKeyId: sbp('chelonia/contract/currentKeyIdByName', ourIdentityContractId, 'cek'),
+        signingKeyId: sbp('chelonia/contract/currentKeyIdByName', ourIdentityContractId, 'csk'),
+        onconflict
+      })
     })
   },
   'gi.actions/identity/kv/loadChatRoomUnreadMessages': () => {
@@ -163,10 +166,13 @@ export default (sbp('sbp/selectors/register', {
     if (!ourIdentityContractId) {
       throw new Error('Unable to update preferences without an active session')
     }
-    return sbp('chelonia/kv/set', ourIdentityContractId, KV_KEYS.PREFERENCES, data, {
-      encryptionKeyId: sbp('chelonia/contract/currentKeyIdByName', ourIdentityContractId, 'cek'),
-      signingKeyId: sbp('chelonia/contract/currentKeyIdByName', ourIdentityContractId, 'csk'),
-      onconflict
+
+    return sbp('chelonia/queueInvocation', ourIdentityContractId, () => {
+      return sbp('chelonia/kv/set', ourIdentityContractId, KV_KEYS.PREFERENCES, data, {
+        encryptionKeyId: sbp('chelonia/contract/currentKeyIdByName', ourIdentityContractId, 'cek'),
+        signingKeyId: sbp('chelonia/contract/currentKeyIdByName', ourIdentityContractId, 'csk'),
+        onconflict
+      })
     })
   },
   'gi.actions/identity/kv/loadPreferences': () => {
@@ -220,10 +226,12 @@ export default (sbp('sbp/selectors/register', {
       return null
     }
 
-    return sbp('chelonia/kv/set', ourIdentityContractId, KV_KEYS.NOTIFICATIONS, applyStorageRules(data), {
-      encryptionKeyId: sbp('chelonia/contract/currentKeyIdByName', ourIdentityContractId, 'cek'),
-      signingKeyId: sbp('chelonia/contract/currentKeyIdByName', ourIdentityContractId, 'csk'),
-      onconflict: updatedOnConflict
+    return sbp('chelonia/queueInvocation', ourIdentityContractId, () => {
+      return sbp('chelonia/kv/set', ourIdentityContractId, KV_KEYS.NOTIFICATIONS, applyStorageRules(data), {
+        encryptionKeyId: sbp('chelonia/contract/currentKeyIdByName', ourIdentityContractId, 'cek'),
+        signingKeyId: sbp('chelonia/contract/currentKeyIdByName', ourIdentityContractId, 'csk'),
+        onconflict: updatedOnConflict
+      })
     })
   },
   'gi.actions/identity/kv/loadNotificationStatus': () => {

frontend/main.js

@@ -121,7 +121,6 @@ async function startApp () {
           'chelonia/queueInvocation', 'chelonia/contract/wait',
           'chelonia/contract/waitingForKeyShareTo',
           'chelonia/contract/successfulKeySharesByContractID',
-          'gi.actions/chatroom/leave',
           'gi.actions/group/removeOurselves', 'gi.actions/group/groupProfileUpdate', 'gi.actions/group/displayMincomeChangedPrompt', 'gi.actions/group/addChatRoom',
           'gi.actions/group/join', 'gi.actions/group/joinChatRoom',
           'gi.actions/identity/addJoinDirectMessageKey', 'gi.actions/identity/leaveGroup',
@@ -130,7 +129,7 @@ async function startApp () {
           'chelonia/out/keyDel',
           'chelonia/contract/disconnect',
           'gi.actions/identity/removeFiles',
-          'gi.actions/chatroom/join',
+          'gi.actions/chatroom/join', 'gi.actions/chatroom/leave', 'gi.actions/chatroom/addMessage',
           'chelonia/contract/hasKeysToPerformOperation',
           'gi.actions/identity/kv/initChatRoomUnreadMessages', 'gi.actions/identity/kv/deleteChatRoomUnreadMessages',
           'gi.actions/identity/kv/setChatRoomReadUntil',

frontend/model/contracts/group.js

@@ -13,7 +13,7 @@ import {
   STATUS_OPEN, STATUS_CANCELLED, STATUS_EXPIRED, MAX_ARCHIVED_PROPOSALS, MAX_ARCHIVED_PERIODS,
   PROPOSAL_ARCHIVED, PAYMENTS_ARCHIVED, MAX_SAVED_PERIODS, GROUP_PAYMENT_METHOD_MAX_CHAR,
   INVITE_INITIAL_CREATOR, PROFILE_STATUS, INVITE_EXPIRES_IN_DAYS,
-  CHATROOM_GENERAL_NAME, CHATROOM_PRIVACY_LEVEL, CHATROOM_TYPES
+  CHATROOM_GENERAL_NAME, CHATROOM_PRIVACY_LEVEL, CHATROOM_TYPES, MESSAGE_TYPES
 } from './shared/constants.js'
 import { paymentStatusType, paymentType, PAYMENT_COMPLETED } from './shared/payments/index.js'
 import { createPaymentInfo, paymentHashesFromPaymentPeriod } from './shared/functions.js'
@@ -913,8 +913,8 @@ sbp('chelonia/defineContract', {
           // TODO - verify if type of proposal already exists (SETTING_CHANGE).
         }
       }),
-      process ({ data, meta, hash, height, innerSigningContractID }, { state }) {
-        Vue.set(state.proposals, hash, {
+      process ({ data, meta, hash, contractID, height, innerSigningContractID }, { state }) {
+        const proposal = {
           data,
           meta,
           height,
@@ -923,10 +923,19 @@ sbp('chelonia/defineContract', {
           status: STATUS_OPEN,
           notifiedBeforeExpire: false,
           payload: null // set later by group/proposalVote
-        })
+        }
+        Vue.set(state.proposals, hash, proposal)
         // TODO: save all proposals disk so that we only keep open proposals in memory
         // TODO: create a global timer to auto-pass/archive expired votes
         //       make sure to set that proposal's status as STATUS_EXPIRED if it's expired
+        sbp('gi.contracts/group/pushSideEffect', contractID,
+          ['gi.contracts/group/notifyProposalStateInGeneralChatroom', {
+            contractID,
+            innerSigningContractID,
+            height,
+            proposal: { ...proposal, proposalId: hash }
+          }]
+        )
       },
       sideEffect ({ contractID, meta, data, height, innerSigningContractID }, { getters }) {
         const { loggedIn } = sbp('state/vuex/state')
@@ -1012,22 +1021,23 @@ sbp('chelonia/defineContract', {
         }
         Vue.set(proposal, 'status', STATUS_CANCELLED)
         Vue.set(proposal, 'dateClosed', meta.createdDate)
-        notifyAndArchiveProposal({ state, proposalHash: data.proposalHash, proposal, contractID, meta, height })
+        notifyAndArchiveProposal({ state, proposalHash: data.proposalHash, proposal, innerSigningContractID, contractID, meta, height })
       }
     },
     'gi.contracts/group/markProposalsExpired': {
       validate: actionRequireActiveMember(objectOf({
         proposalIds: arrayOf(string)
       })),
-      process ({ data, meta, contractID, height }, { state }) {
+      process ({ data, meta, contractID, innerSigningContractID, height }, { state }) {
         if (data.proposalIds.length) {
           for (const proposalId of data.proposalIds) {
             const proposal = state.proposals[proposalId]
 
             if (proposal) {
               Vue.set(proposal, 'status', STATUS_EXPIRED)
               Vue.set(proposal, 'dateClosed', meta.createdDate)
-              notifyAndArchiveProposal({ state, proposalHash: proposalId, proposal, contractID, meta, height })
+
+              notifyAndArchiveProposal({ state, proposalHash: proposalId, proposal, innerSigningContractID, contractID, meta, height })
             }
           }
         }
@@ -1747,6 +1757,30 @@ sbp('chelonia/defineContract', {
         }])
       }
     },
+    'gi.contracts/group/notifyProposalStateInGeneralChatroom': async function ({ contractID, innerSigningContractID, height, proposal }) {
+      const rootState = sbp('state/vuex/state')
+      const { profiles, generalChatRoomId } = rootState[contractID]
+      const myProfile = profiles[rootState.loggedIn.identityContractID]
+      if (rootState.loggedIn.identityContractID === innerSigningContractID) {
+        if (isActionOlderThanUser(contractID, height, myProfile)) {
+          await sbp('gi.actions/chatroom/addMessage', {
+            contractID: generalChatRoomId,
+            data: {
+              type: MESSAGE_TYPES.INTERACTIVE,
+              proposal: {
+                proposalId: proposal.proposalId,
+                proposalType: proposal.data.proposalType,
+                proposalData: proposal.data.proposalData,
+                expires_date_ms: proposal.data.expires_date_ms,
+                createdDate: proposal.meta.createdDate,
+                creatorID: proposal.creatorID,
+                status: proposal.status
+              }
+            }
+          })
+        }
+      }
+    },
     'gi.contracts/group/sendMincomeChangedNotification': async function (contractID, meta, data, height, innerSigningContractID) {
       // NOTE: When group's mincome has changed, below actions should be taken.
       // - When mincome has increased, send 'MINCOME_CHANGED' notification to both receiving/pledging members.

frontend/model/contracts/shared/types.js

@@ -10,7 +10,12 @@ import {
   MESSAGE_TYPES,
   MESSAGE_NOTIFICATIONS,
   POLL_TYPES,
-  STATUS_EXPIRING
+  STATUS_OPEN,
+  STATUS_PASSED,
+  STATUS_FAILED,
+  STATUS_EXPIRING,
+  STATUS_EXPIRED,
+  STATUS_CANCELLED
 } from './constants.js'
 
 // group.js related
@@ -36,13 +41,21 @@ export const chatRoomAttributesType: any = objectOf({
 export const messageType: any = objectMaybeOf({
   type: unionOf(...Object.values(MESSAGE_TYPES).map(v => literalOf(v))),
   text: string,
-  proposal: objectMaybeOf({
+  proposal: objectOf({
     proposalId: string,
     proposalType: string,
+    proposalData: object,
     expires_date_ms: number,
     createdDate: string,
     creatorID: string,
-    variant: unionOf([STATUS_EXPIRING].map(v => literalOf(v))) // NOTE: only expiring proposals could be notified at the moment
+    status: unionOf(...[
+      STATUS_OPEN,
+      STATUS_PASSED,
+      STATUS_FAILED,
+      STATUS_EXPIRING,
+      STATUS_EXPIRED,
+      STATUS_CANCELLED
+    ].map(v => literalOf(v)))
   }),
   notification: objectMaybeOf({
     type: unionOf(...Object.values(MESSAGE_NOTIFICATIONS).map(v => literalOf(v))),

frontend/model/contracts/shared/voting/proposals.js

@@ -19,12 +19,26 @@ import {
   // STATUS_CANCELLED
 } from '../constants.js'
 
-export function notifyAndArchiveProposal (
-  { state, proposalHash, proposal, contractID, meta, height }: {
-    state: Object, proposalHash: string, proposal: any, contractID: string, meta: Object, height: number
-  }) {
+export function notifyAndArchiveProposal ({ state, proposalHash, innerSigningContractID, proposal, contractID, meta, height }: {
+  state: Object,
+  proposalHash: string,
+  proposal: any,
+  innerSigningContractID: string,
+  contractID: string,
+  meta: Object,
+  height: number
+}) {
   Vue.delete(state.proposals, proposalHash)
 
+  sbp('gi.contracts/group/pushSideEffect', contractID,
+    ['gi.contracts/group/notifyProposalStateInGeneralChatroom', {
+      contractID,
+      innerSigningContractID,
+      height,
+      proposal: { ...proposal, proposalId: proposalHash }
+    }]
+  )
+
   // NOTE: we can not make notification for the proposal closal
   //       in the /proposalVote/sideEffect
   //       because we remove the state.proposals[proposalHash] in the process function
@@ -79,12 +93,12 @@ export function oneVoteToPass (proposalHash: string): boolean {
   return newResult === VOTE_FOR
 }
 
-function voteAgainst (state: any, { meta, data, contractID, height }: any) {
+function voteAgainst (state: any, { meta, data, contractID, innerSigningContractID, height }: any) {
   const { proposalHash } = data
   const proposal = state.proposals[proposalHash]
   proposal.status = STATUS_FAILED
   sbp('okTurtles.events/emit', PROPOSAL_RESULT, state, VOTE_AGAINST, data)
-  notifyAndArchiveProposal({ state, proposalHash, proposal, contractID, meta, height })
+  notifyAndArchiveProposal({ state, proposalHash, proposal, innerSigningContractID, contractID, meta, height })
 }
 
 // NOTE: The code is ready to receive different proposals settings,
@@ -102,7 +116,7 @@ const proposals: Object = {
   [PROPOSAL_INVITE_MEMBER]: {
     defaults: proposalDefaults,
     [VOTE_FOR]: function (state, message) {
-      const { data, contractID, meta, height } = message
+      const { data, innerSigningContractID, contractID, meta, height } = message
       const { proposalHash } = data
       const proposal = state.proposals[proposalHash]
       proposal.payload = data.passPayload
@@ -112,7 +126,7 @@ const proposals: Object = {
       const forMessage = { ...message, data: data.passPayload }
       sbp('gi.contracts/group/invite/process', forMessage, state)
       sbp('okTurtles.events/emit', PROPOSAL_RESULT, state, VOTE_FOR, data)
-      notifyAndArchiveProposal({ state, proposalHash, proposal, contractID, meta, height })
+      notifyAndArchiveProposal({ state, proposalHash, proposal, innerSigningContractID, contractID, meta, height })
       // TODO: for now, generate the link and send it to the user's inbox
       //       however, we cannot send GIMessages in any way from here
       //       because that means each time someone synchronizes this contract
@@ -149,7 +163,7 @@ const proposals: Object = {
   [PROPOSAL_REMOVE_MEMBER]: {
     defaults: proposalDefaults,
     [VOTE_FOR]: function (state, message) {
-      const { data, contractID, meta, height } = message
+      const { data, innerSigningContractID, contractID, meta, height } = message
       const { proposalHash, passPayload } = data
       const proposal = state.proposals[proposalHash]
       proposal.status = STATUS_PASSED
@@ -160,14 +174,14 @@ const proposals: Object = {
       sbp('gi.contracts/group/pushSideEffect', contractID,
         ['gi.contracts/group/removeMember/sideEffect', forMessage]
       )
-      notifyAndArchiveProposal({ state, proposalHash, proposal, contractID, meta, height })
+      notifyAndArchiveProposal({ state, proposalHash, proposal, innerSigningContractID, contractID, meta, height })
     },
     [VOTE_AGAINST]: voteAgainst
   },
   [PROPOSAL_GROUP_SETTING_CHANGE]: {
     defaults: proposalDefaults,
     [VOTE_FOR]: function (state, message) {
-      const { data, contractID, meta, height } = message
+      const { data, innerSigningContractID, contractID, meta, height } = message
       const { proposalHash } = data
       const proposal = state.proposals[proposalHash]
       proposal.status = STATUS_PASSED
@@ -182,14 +196,14 @@ const proposals: Object = {
       sbp('gi.contracts/group/updateSettings/process', forMessage, state)
       sbp('gi.contracts/group/pushSideEffect', contractID,
         ['gi.contracts/group/updateSettings/sideEffect', forMessage])
-      notifyAndArchiveProposal({ state, proposalHash, proposal, contractID, meta, height })
+      notifyAndArchiveProposal({ state, proposalHash, proposal, innerSigningContractID, contractID, meta, height })
     },
     [VOTE_AGAINST]: voteAgainst
   },
   [PROPOSAL_PROPOSAL_SETTING_CHANGE]: {
     defaults: proposalDefaults,
     [VOTE_FOR]: function (state, message) {
-      const { data, contractID, meta, height } = message
+      const { data, innerSigningContractID, contractID, meta, height } = message
       const { proposalHash } = data
       const proposal = state.proposals[proposalHash]
       proposal.status = STATUS_PASSED
@@ -199,18 +213,18 @@ const proposals: Object = {
         proposalHash
       }
       sbp('gi.contracts/group/updateAllVotingRules/process', forMessage, state)
-      notifyAndArchiveProposal({ state, proposalHash, proposal, contractID, meta, height })
+      notifyAndArchiveProposal({ state, proposalHash, proposal, innerSigningContractID, contractID, meta, height })
     },
     [VOTE_AGAINST]: voteAgainst
   },
   [PROPOSAL_GENERIC]: {
     defaults: proposalDefaults,
-    [VOTE_FOR]: function (state, { data, contractID, meta, height }) {
+    [VOTE_FOR]: function (state, { data, innerSigningContractID, contractID, meta, height }) {
       const { proposalHash } = data
       const proposal = state.proposals[proposalHash]
       proposal.status = STATUS_PASSED
       sbp('okTurtles.events/emit', PROPOSAL_RESULT, state, VOTE_FOR, data)
-      notifyAndArchiveProposal({ state, proposalHash, proposal, contractID, meta, height })
+      notifyAndArchiveProposal({ state, proposalHash, proposal, innerSigningContractID, contractID, meta, height })
     },
     [VOTE_AGAINST]: voteAgainst
   }