feat: add function to redux to grab group detail outside of store
Audric Ackermann
2 years ago
parent
bbedfd943c
commit
46e3675c45
@ -1,166 +0,0 @@
|
||||
import { createAsyncThunk, createSlice, PayloadAction } from '@reduxjs/toolkit';
|
||||
import { GroupInfoGet, GroupInfoShared, GroupPubkeyType } from 'libsession_util_nodejs';
|
||||
import { uniq } from 'lodash';
|
||||
import { ConversationTypeEnum } from '../../models/conversationAttributes';
|
||||
import { HexString } from '../../node/hexStrings';
|
||||
import { ClosedGroup } from '../../session';
|
||||
import { getConversationController } from '../../session/conversations';
|
||||
import { UserUtils } from '../../session/utils';
|
||||
import { GroupSync } from '../../session/utils/job_runners/jobs/GroupConfigJob';
|
||||
import { toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes';
|
||||
import {
|
||||
MetaGroupWrapperActions,
|
||||
UserGroupsWrapperActions,
|
||||
} from '../../webworker/workers/browser/libsession_worker_interface';
|
||||
|
||||
type GroupInfoGetWithId = GroupInfoGet & { id: GroupPubkeyType };
|
||||
|
||||
export type GroupInfosState = {
|
||||
infos: Record<GroupPubkeyType, GroupInfoGetWithId>;
|
||||
};
|
||||
|
||||
export const initialGroupInfosState: GroupInfosState = {
|
||||
infos: {},
|
||||
};
|
||||
|
||||
const updateGroupInfoInWrapper = createAsyncThunk(
|
||||
'groupInfos/updateGroupInfoInWrapper',
|
||||
async ({
|
||||
id,
|
||||
data,
|
||||
}: {
|
||||
id: GroupPubkeyType;
|
||||
data: GroupInfoShared;
|
||||
}): Promise<GroupInfoGetWithId> => {
|
||||
// TODO this will throw if the wrapper is not init yet... how to make sure it does exist?
|
||||
const infos = await MetaGroupWrapperActions.infoSet(id, data);
|
||||
return { id, ...infos };
|
||||
}
|
||||
);
|
||||
|
||||
const initNewGroupInfoInWrapper = createAsyncThunk(
|
||||
'groupInfos/initNewGroupInfoInWrapper',
|
||||
async (groupDetails: {
|
||||
groupName: string;
|
||||
members: Array<string>;
|
||||
}): Promise<GroupInfoGetWithId> => {
|
||||
try {
|
||||
const newGroup = await UserGroupsWrapperActions.createGroup();
|
||||
|
||||
await UserGroupsWrapperActions.setGroup(newGroup);
|
||||
|
||||
const ourEd25519KeypairBytes = await UserUtils.getUserED25519KeyPairBytes();
|
||||
if (!ourEd25519KeypairBytes) {
|
||||
throw new Error('Current user has no priv ed25519 key?');
|
||||
}
|
||||
const userEd25519Secretkey = ourEd25519KeypairBytes.privKeyBytes;
|
||||
const groupEd2519Pk = HexString.fromHexString(newGroup.pubkeyHex).slice(1); // remove the 03 prefix (single byte once in hex form)
|
||||
|
||||
// dump is always empty when creating a new groupInfo
|
||||
await MetaGroupWrapperActions.init(newGroup.pubkeyHex, {
|
||||
metaDumped: null,
|
||||
userEd25519Secretkey: toFixedUint8ArrayOfLength(userEd25519Secretkey, 64),
|
||||
groupEd25519Secretkey: newGroup.secretKey,
|
||||
groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd2519Pk, 32),
|
||||
});
|
||||
|
||||
await Promise.all(
|
||||
groupDetails.members.map(async member => {
|
||||
const created = await MetaGroupWrapperActions.memberGetOrConstruct(
|
||||
newGroup.pubkeyHex,
|
||||
member
|
||||
);
|
||||
await MetaGroupWrapperActions.memberSetInvited(
|
||||
newGroup.pubkeyHex,
|
||||
created.pubkeyHex,
|
||||
false
|
||||
);
|
||||
})
|
||||
);
|
||||
const infos = await MetaGroupWrapperActions.infoGet(newGroup.pubkeyHex);
|
||||
|
||||
if (!infos) {
|
||||
throw new Error(
|
||||
`getInfos of ${newGroup.pubkeyHex} returned empty result even if it was just init.`
|
||||
);
|
||||
}
|
||||
infos.name = groupDetails.groupName;
|
||||
await MetaGroupWrapperActions.infoSet(newGroup.pubkeyHex, infos);
|
||||
|
||||
const convo = await getConversationController().getOrCreateAndWait(
|
||||
newGroup.pubkeyHex,
|
||||
ConversationTypeEnum.GROUPV3
|
||||
);
|
||||
|
||||
await convo.setIsApproved(true, false);
|
||||
|
||||
console.warn('store the v3 identityPrivatekeypair as part of the wrapper only?');
|
||||
// the sync below will need the secretKey of the group to be saved in the wrapper. So save it!
|
||||
await UserGroupsWrapperActions.setGroup(newGroup);
|
||||
|
||||
await GroupSync.queueNewJobIfNeeded(newGroup.pubkeyHex);
|
||||
|
||||
const us = UserUtils.getOurPubKeyStrFromCache();
|
||||
// Ensure the current user is a member and admin
|
||||
const members = uniq([...groupDetails.members, us]);
|
||||
|
||||
const updateGroupDetails: ClosedGroup.GroupInfo = {
|
||||
id: newGroup.pubkeyHex,
|
||||
name: groupDetails.groupName,
|
||||
members,
|
||||
admins: [us],
|
||||
activeAt: Date.now(),
|
||||
expireTimer: 0,
|
||||
};
|
||||
|
||||
// be sure to call this before sending the message.
|
||||
// the sending pipeline needs to know from GroupUtils when a message is for a medium group
|
||||
await ClosedGroup.updateOrCreateClosedGroup(updateGroupDetails);
|
||||
await convo.commit();
|
||||
convo.updateLastMessage();
|
||||
|
||||
return { id: newGroup.pubkeyHex, ...infos };
|
||||
} catch (e) {
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
/**
|
||||
* This slice is the one holding the default joinable rooms fetched once in a while from the default opengroup v2 server.
|
||||
*/
|
||||
const groupInfosSlice = createSlice({
|
||||
name: 'groupInfos',
|
||||
initialState: initialGroupInfosState,
|
||||
reducers: {
|
||||
updateGroupInfosFromMergeResults(state, action: PayloadAction<Array<GroupInfoGetWithId>>) {
|
||||
// anything not in the results should not be in the state here
|
||||
state.infos = {};
|
||||
action.payload.forEach(infos => {
|
||||
state.infos[infos.id] = infos;
|
||||
});
|
||||
return state;
|
||||
},
|
||||
},
|
||||
extraReducers: builder => {
|
||||
builder.addCase(updateGroupInfoInWrapper.fulfilled, (state, action) => {
|
||||
state.infos[action.payload.id] = action.payload;
|
||||
});
|
||||
builder.addCase(initNewGroupInfoInWrapper.fulfilled, (state, action) => {
|
||||
state.infos[action.payload.id] = action.payload;
|
||||
});
|
||||
builder.addCase(updateGroupInfoInWrapper.rejected, () => {
|
||||
window.log.error('a updateGroupInfoInWrapper was rejected');
|
||||
});
|
||||
builder.addCase(initNewGroupInfoInWrapper.rejected, () => {
|
||||
window.log.error('a initNewGroupInfoInWrapper was rejected');
|
||||
});
|
||||
},
|
||||
});
|
||||
|
||||
export const groupInfoActions = {
|
||||
initNewGroupInfoInWrapper,
|
||||
updateGroupInfoInWrapper,
|
||||
...groupInfosSlice.actions,
|
||||
};
|
||||
export const groupInfosReducer = groupInfosSlice.reducer;
|
||||
@ -0,0 +1,217 @@
|
||||
import { PayloadAction, createAsyncThunk, createSlice } from '@reduxjs/toolkit';
|
||||
import { GroupInfoGet, GroupMemberGet, GroupPubkeyType } from 'libsession_util_nodejs';
|
||||
import { isEmpty } from 'lodash';
|
||||
import { ConfigDumpData } from '../../data/configDump/configDump';
|
||||
import { ConversationTypeEnum } from '../../models/conversationAttributes';
|
||||
import { HexString } from '../../node/hexStrings';
|
||||
import { getConversationController } from '../../session/conversations';
|
||||
import { UserUtils } from '../../session/utils';
|
||||
import { GroupSync } from '../../session/utils/job_runners/jobs/GroupConfigJob';
|
||||
import { toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes';
|
||||
import {
|
||||
getGroupPubkeyFromWrapperType,
|
||||
isMetaWrapperType,
|
||||
} from '../../webworker/workers/browser/libsession_worker_functions';
|
||||
import {
|
||||
MetaGroupWrapperActions,
|
||||
UserGroupsWrapperActions,
|
||||
} from '../../webworker/workers/browser/libsession_worker_interface';
|
||||
|
||||
export type GroupState = {
|
||||
infos: Record<GroupPubkeyType, GroupInfoGet>;
|
||||
members: Record<GroupPubkeyType, Array<GroupMemberGet>>;
|
||||
};
|
||||
|
||||
export const initialGroupState: GroupState = {
|
||||
infos: {},
|
||||
members: {},
|
||||
};
|
||||
|
||||
type GroupDetailsUpdate = {
|
||||
groupPk: GroupPubkeyType;
|
||||
infos: GroupInfoGet;
|
||||
members: Array<GroupMemberGet>;
|
||||
};
|
||||
|
||||
const initNewGroupInWrapper = createAsyncThunk(
|
||||
'group/initNewGroupInWrapper',
|
||||
async (groupDetails: {
|
||||
groupName: string;
|
||||
members: Array<string>;
|
||||
}): Promise<GroupDetailsUpdate> => {
|
||||
try {
|
||||
const newGroup = await UserGroupsWrapperActions.createGroup();
|
||||
|
||||
await UserGroupsWrapperActions.setGroup(newGroup);
|
||||
|
||||
const ourEd25519KeypairBytes = await UserUtils.getUserED25519KeyPairBytes();
|
||||
if (!ourEd25519KeypairBytes) {
|
||||
throw new Error('Current user has no priv ed25519 key?');
|
||||
}
|
||||
const userEd25519Secretkey = ourEd25519KeypairBytes.privKeyBytes;
|
||||
const groupEd2519Pk = HexString.fromHexString(newGroup.pubkeyHex).slice(1); // remove the 03 prefix (single byte once in hex form)
|
||||
|
||||
// dump is always empty when creating a new groupInfo
|
||||
await MetaGroupWrapperActions.init(newGroup.pubkeyHex, {
|
||||
metaDumped: null,
|
||||
userEd25519Secretkey: toFixedUint8ArrayOfLength(userEd25519Secretkey, 64),
|
||||
groupEd25519Secretkey: newGroup.secretKey,
|
||||
groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd2519Pk, 32),
|
||||
});
|
||||
|
||||
await Promise.all(
|
||||
groupDetails.members.map(async member => {
|
||||
const created = await MetaGroupWrapperActions.memberGetOrConstruct(
|
||||
newGroup.pubkeyHex,
|
||||
member
|
||||
);
|
||||
await MetaGroupWrapperActions.memberSetInvited(
|
||||
newGroup.pubkeyHex,
|
||||
created.pubkeyHex,
|
||||
false
|
||||
);
|
||||
})
|
||||
);
|
||||
const infos = await MetaGroupWrapperActions.infoGet(newGroup.pubkeyHex);
|
||||
if (!infos) {
|
||||
throw new Error(
|
||||
`getInfos of ${newGroup.pubkeyHex} returned empty result even if it was just init.`
|
||||
);
|
||||
}
|
||||
infos.name = groupDetails.groupName;
|
||||
await MetaGroupWrapperActions.infoSet(newGroup.pubkeyHex, infos);
|
||||
|
||||
const members = await MetaGroupWrapperActions.memberGetAll(newGroup.pubkeyHex);
|
||||
if (!members || isEmpty(members)) {
|
||||
throw new Error(
|
||||
`memberGetAll of ${newGroup.pubkeyHex} returned empty result even if it was just init.`
|
||||
);
|
||||
}
|
||||
|
||||
const convo = await getConversationController().getOrCreateAndWait(
|
||||
newGroup.pubkeyHex,
|
||||
ConversationTypeEnum.GROUPV3
|
||||
);
|
||||
|
||||
await convo.setIsApproved(true, false);
|
||||
|
||||
// console.warn('store the v3 identityPrivatekeypair as part of the wrapper only?');
|
||||
// // the sync below will need the secretKey of the group to be saved in the wrapper. So save it!
|
||||
await UserGroupsWrapperActions.setGroup(newGroup);
|
||||
|
||||
await GroupSync.queueNewJobIfNeeded(newGroup.pubkeyHex);
|
||||
|
||||
// const us = UserUtils.getOurPubKeyStrFromCache();
|
||||
// // Ensure the current user is a member and admin
|
||||
// const members = uniq([...groupDetails.members, us]);
|
||||
|
||||
// const updateGroupDetails: ClosedGroup.GroupInfo = {
|
||||
// id: newGroup.pubkeyHex,
|
||||
// name: groupDetails.groupName,
|
||||
// members,
|
||||
// admins: [us],
|
||||
// activeAt: Date.now(),
|
||||
// expireTimer: 0,
|
||||
// };
|
||||
|
||||
// // be sure to call this before sending the message.
|
||||
// // the sending pipeline needs to know from GroupUtils when a message is for a medium group
|
||||
// await ClosedGroup.updateOrCreateClosedGroup(updateGroupDetails);
|
||||
await convo.unhideIfNeeded();
|
||||
convo.set({ active_at: Date.now() });
|
||||
await convo.commit();
|
||||
convo.updateLastMessage();
|
||||
|
||||
return { groupPk: newGroup.pubkeyHex, infos, members };
|
||||
} catch (e) {
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
const loadDumpsFromDB = createAsyncThunk(
|
||||
'group/loadDumpsFromDB',
|
||||
async (): Promise<Array<GroupDetailsUpdate>> => {
|
||||
const variantsWithoutData = await ConfigDumpData.getAllDumpsWithoutData();
|
||||
const allUserGroups = await UserGroupsWrapperActions.getAllGroups();
|
||||
const toReturn: Array<GroupDetailsUpdate> = [];
|
||||
for (let index = 0; index < variantsWithoutData.length; index++) {
|
||||
const { variant } = variantsWithoutData[index];
|
||||
if (!isMetaWrapperType(variant)) {
|
||||
continue;
|
||||
}
|
||||
const groupPk = getGroupPubkeyFromWrapperType(variant);
|
||||
const foundInUserWrapper = allUserGroups.find(m => m.pubkeyHex === groupPk);
|
||||
if (!foundInUserWrapper) {
|
||||
continue;
|
||||
}
|
||||
|
||||
try {
|
||||
window.log.debug(
|
||||
'loadDumpsFromDB loading from metagroup variant: ',
|
||||
variant,
|
||||
foundInUserWrapper.pubkeyHex
|
||||
);
|
||||
|
||||
const infos = await MetaGroupWrapperActions.infoGet(groupPk);
|
||||
const members = await MetaGroupWrapperActions.memberGetAll(groupPk);
|
||||
|
||||
toReturn.push({ groupPk, infos, members });
|
||||
|
||||
// Annoyingly, the redux store is not initialized when this current funciton is called,
|
||||
// so we need to init the group wrappers here, but load them in their redux slice later
|
||||
} catch (e) {
|
||||
// TODO should not throw in this case? we should probably just try to load what we manage to load
|
||||
window.log.warn(
|
||||
`initGroup of Group wrapper of variant ${variant} failed with ${e.message} `
|
||||
);
|
||||
// throw new Error(`initializeLibSessionUtilWrappers failed with ${e.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
return toReturn;
|
||||
}
|
||||
);
|
||||
|
||||
/**
|
||||
* This slice is the one holding the default joinable rooms fetched once in a while from the default opengroup v2 server.
|
||||
*/
|
||||
const groupSlice = createSlice({
|
||||
name: 'group',
|
||||
initialState: initialGroupState,
|
||||
reducers: {
|
||||
updateGroupDetailsAfterMerge(state, action: PayloadAction<GroupDetailsUpdate>) {
|
||||
const { groupPk, infos, members } = action.payload;
|
||||
state.infos[groupPk] = infos;
|
||||
state.members[groupPk] = members;
|
||||
},
|
||||
},
|
||||
extraReducers: builder => {
|
||||
builder.addCase(initNewGroupInWrapper.fulfilled, (state, action) => {
|
||||
const { groupPk, infos, members } = action.payload;
|
||||
state.infos[groupPk] = infos;
|
||||
state.members[groupPk] = members;
|
||||
});
|
||||
builder.addCase(initNewGroupInWrapper.rejected, () => {
|
||||
window.log.error('a initNewGroupInWrapper was rejected');
|
||||
// FIXME delete the wrapper completely & correspondign dumps, and usergroups entry?
|
||||
});
|
||||
builder.addCase(loadDumpsFromDB.fulfilled, (state, action) => {
|
||||
const loaded = action.payload;
|
||||
loaded.forEach(element => {
|
||||
state.infos[element.groupPk] = element.infos;
|
||||
state.members[element.groupPk] = element.members;
|
||||
});
|
||||
});
|
||||
builder.addCase(loadDumpsFromDB.rejected, () => {
|
||||
window.log.error('a loadDumpsFromDB was rejected');
|
||||
});
|
||||
},
|
||||
});
|
||||
|
||||
export const groupInfoActions = {
|
||||
initNewGroupInWrapper,
|
||||
loadDumpsFromDB,
|
||||
...groupSlice.actions,
|
||||
};
|
||||
export const groupReducer = groupSlice.reducer;
|
||||
@ -0,0 +1,83 @@
|
||||
import { GroupPubkeyType } from 'libsession_util_nodejs';
|
||||
import { isEmpty } from 'lodash';
|
||||
import { PubKey } from '../../session/types';
|
||||
import { GroupState } from '../ducks/groups';
|
||||
import { StateType } from '../reducer';
|
||||
import { useSelector } from 'react-redux';
|
||||
|
||||
const getLibGroupsState = (state: StateType): GroupState => state.groups;
|
||||
|
||||
export function getLibMembersPubkeys(state: StateType, convo?: string): Array<string> {
|
||||
if (!convo) {
|
||||
return [];
|
||||
}
|
||||
if (!PubKey.isClosedGroupV2(convo)) {
|
||||
return [];
|
||||
}
|
||||
|
||||
const members = getLibGroupsState(state).members[convo];
|
||||
if (isEmpty(members)) {
|
||||
return [];
|
||||
}
|
||||
|
||||
return members.map(m => m.pubkeyHex);
|
||||
}
|
||||
|
||||
export function getLibAdminsPubkeys(state: StateType, convo?: string): Array<string> {
|
||||
if (!convo) {
|
||||
return [];
|
||||
}
|
||||
if (!PubKey.isClosedGroupV2(convo)) {
|
||||
return [];
|
||||
}
|
||||
|
||||
const members = getLibGroupsState(state).members[convo];
|
||||
if (isEmpty(members)) {
|
||||
return [];
|
||||
}
|
||||
|
||||
return members.filter(m => m.promoted).map(m => m.pubkeyHex);
|
||||
}
|
||||
|
||||
export function getLibMembersCount(state: StateType, convo?: GroupPubkeyType): Array<string> {
|
||||
return getLibMembersPubkeys(state, convo);
|
||||
}
|
||||
|
||||
function getLibGroupName(state: StateType, convo?: string): string | undefined {
|
||||
if (!convo) {
|
||||
return undefined;
|
||||
}
|
||||
if (!PubKey.isClosedGroupV2(convo)) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
const name = getLibGroupsState(state).infos[convo]?.name;
|
||||
return name || undefined;
|
||||
}
|
||||
|
||||
export function useLibGroupName(convoId?: string): string | undefined {
|
||||
return useSelector((state: StateType) => getLibGroupName(state, convoId));
|
||||
}
|
||||
|
||||
export function useLibGroupMembers(convoId?: string): Array<string> {
|
||||
return useSelector((state: StateType) => getLibMembersPubkeys(state, convoId));
|
||||
}
|
||||
|
||||
export function useLibGroupAdmins(convoId?: string): Array<string> {
|
||||
return useSelector((state: StateType) => getLibAdminsPubkeys(state, convoId));
|
||||
}
|
||||
|
||||
export function getLibGroupNameOutsideRedux(convoId: string): string | undefined {
|
||||
const state = window.inboxStore?.getState();
|
||||
return state ? getLibGroupName(state, convoId) : undefined;
|
||||
}
|
||||
|
||||
export function getLibGroupMembersOutsideRedux(convoId: string): Array<string> {
|
||||
const state = window.inboxStore?.getState();
|
||||
return state ? getLibMembersPubkeys(state, convoId) : [];
|
||||
}
|
||||
|
||||
export function getLibGroupAdminsOutsideRedux(convoId: string): Array<string> {
|
||||
const state = window.inboxStore?.getState();
|
||||
return state ? getLibAdminsPubkeys(state, convoId) : [];
|
||||
}
|
||||
Loading…
Reference in New Issue