split conversation reducer for convo logic
also - fix ordering of messages for open groups, when they are added - fix the way the firstMessageOfSeries for just created clsoed groupspull/1423/head
Audric Ackermann
4 years ago
parent
1aa165c261
commit
9048913332
@ -1,336 +1,339 @@
|
||||
import {
|
||||
ConversationAttributes,
|
||||
ConversationModel,
|
||||
ConversationAttributes,
|
||||
ConversationModel,
|
||||
} from '../../../js/models/conversations';
|
||||
import { BlockedNumberController } from '../../util';
|
||||
|
||||
// It's not only data from the db which is stored on the MessageController entries, we could fetch this again. What we cannot fetch from the db and which is stored here is all listeners a particular messages is linked to for instance. We will be able to get rid of this once we don't use backbone models at all
|
||||
export class ConversationController {
|
||||
private static instance: ConversationController | null;
|
||||
private readonly conversations: any;
|
||||
private _initialFetchComplete: boolean = false;
|
||||
private _initialPromise?: Promise<any>;
|
||||
|
||||
private constructor() {
|
||||
this.conversations = new window.Whisper.ConversationCollection();
|
||||
private static instance: ConversationController | null;
|
||||
private readonly conversations: any;
|
||||
private _initialFetchComplete: boolean = false;
|
||||
private _initialPromise?: Promise<any>;
|
||||
|
||||
private constructor() {
|
||||
this.conversations = new window.Whisper.ConversationCollection();
|
||||
}
|
||||
|
||||
public static getInstance() {
|
||||
if (ConversationController.instance) {
|
||||
return ConversationController.instance;
|
||||
}
|
||||
|
||||
public static getInstance() {
|
||||
if (ConversationController.instance) {
|
||||
return ConversationController.instance;
|
||||
}
|
||||
ConversationController.instance = new ConversationController();
|
||||
return ConversationController.instance;
|
||||
ConversationController.instance = new ConversationController();
|
||||
return ConversationController.instance;
|
||||
}
|
||||
|
||||
public get(id: string): ConversationModel {
|
||||
if (!this._initialFetchComplete) {
|
||||
throw new Error(
|
||||
'ConversationController.get() needs complete initial fetch'
|
||||
);
|
||||
}
|
||||
|
||||
public get(id: string): ConversationModel {
|
||||
if (!this._initialFetchComplete) {
|
||||
throw new Error(
|
||||
'ConversationController.get() needs complete initial fetch'
|
||||
);
|
||||
}
|
||||
return this.conversations.get(id);
|
||||
}
|
||||
|
||||
return this.conversations.get(id);
|
||||
public getOrThrow(id: string) {
|
||||
if (!this._initialFetchComplete) {
|
||||
throw new Error(
|
||||
'ConversationController.get() needs complete initial fetch'
|
||||
);
|
||||
}
|
||||
|
||||
public getOrThrow(id: string) {
|
||||
if (!this._initialFetchComplete) {
|
||||
throw new Error(
|
||||
'ConversationController.get() needs complete initial fetch'
|
||||
);
|
||||
}
|
||||
const convo = this.conversations.get(id);
|
||||
|
||||
const convo = this.conversations.get(id);
|
||||
if (convo) {
|
||||
return convo;
|
||||
}
|
||||
throw new Error(
|
||||
`Conversation ${id} does not exist on ConversationController.get()`
|
||||
);
|
||||
}
|
||||
// Needed for some model setup which happens during the initial fetch() call below
|
||||
public getUnsafe(id: string) {
|
||||
return this.conversations.get(id);
|
||||
}
|
||||
|
||||
public dangerouslyCreateAndAdd(attributes: ConversationAttributes) {
|
||||
return this.conversations.add(attributes);
|
||||
}
|
||||
|
||||
public getOrCreate(id: string, type: string) {
|
||||
if (typeof id !== 'string') {
|
||||
throw new TypeError("'id' must be a string");
|
||||
}
|
||||
|
||||
if (convo) {
|
||||
return convo;
|
||||
}
|
||||
throw new Error(
|
||||
`Conversation ${id} does not exist on ConversationController.get()`
|
||||
);
|
||||
if (type !== 'private' && type !== 'group') {
|
||||
throw new TypeError(
|
||||
`'type' must be 'private' or 'group'; got: '${type}'`
|
||||
);
|
||||
}
|
||||
// Needed for some model setup which happens during the initial fetch() call below
|
||||
public getUnsafe(id: string) {
|
||||
return this.conversations.get(id);
|
||||
|
||||
if (!this._initialFetchComplete) {
|
||||
throw new Error(
|
||||
'ConversationController.get() needs complete initial fetch'
|
||||
);
|
||||
}
|
||||
|
||||
public dangerouslyCreateAndAdd(attributes: ConversationAttributes) {
|
||||
return this.conversations.add(attributes);
|
||||
let conversation = this.conversations.get(id);
|
||||
if (conversation) {
|
||||
return conversation;
|
||||
}
|
||||
|
||||
public getOrCreate(id: string, type: string) {
|
||||
if (typeof id !== 'string') {
|
||||
throw new TypeError("'id' must be a string");
|
||||
}
|
||||
|
||||
if (type !== 'private' && type !== 'group') {
|
||||
throw new TypeError(
|
||||
`'type' must be 'private' or 'group'; got: '${type}'`
|
||||
);
|
||||
}
|
||||
|
||||
if (!this._initialFetchComplete) {
|
||||
throw new Error(
|
||||
'ConversationController.get() needs complete initial fetch'
|
||||
);
|
||||
}
|
||||
|
||||
let conversation = this.conversations.get(id);
|
||||
if (conversation) {
|
||||
return conversation;
|
||||
}
|
||||
|
||||
conversation = this.conversations.add({
|
||||
id,
|
||||
type,
|
||||
version: 2,
|
||||
} as any);
|
||||
|
||||
const create = async () => {
|
||||
if (!conversation.isValid()) {
|
||||
const validationError = conversation.validationError || {};
|
||||
window.log.error(
|
||||
'Contact is not valid. Not saving, but adding to collection:',
|
||||
conversation.idForLogging(),
|
||||
validationError.stack
|
||||
);
|
||||
|
||||
return conversation;
|
||||
}
|
||||
|
||||
try {
|
||||
await window.Signal.Data.saveConversation(conversation.attributes, {
|
||||
Conversation: window.Whisper.Conversation,
|
||||
});
|
||||
} catch (error) {
|
||||
window.log.error(
|
||||
'Conversation save failed! ',
|
||||
id,
|
||||
type,
|
||||
'Error:',
|
||||
error && error.stack ? error.stack : error
|
||||
);
|
||||
throw error;
|
||||
}
|
||||
|
||||
return conversation;
|
||||
};
|
||||
|
||||
conversation.initialPromise = create();
|
||||
conversation.initialPromise.then(async () => {
|
||||
if (!conversation.isPublic() && !conversation.isRss()) {
|
||||
await Promise.all([
|
||||
conversation.updateProfileAvatar(),
|
||||
// NOTE: we request snodes updating the cache, but ignore the result
|
||||
window.SnodePool.getSnodesFor(id),
|
||||
]);
|
||||
}
|
||||
if (window.inboxStore) {
|
||||
conversation.on('change', this.updateReduxConvoChanged);
|
||||
window.inboxStore.dispatch(
|
||||
window.actionsCreators.conversationAdded(
|
||||
conversation.id,
|
||||
conversation.getProps()
|
||||
)
|
||||
);
|
||||
}
|
||||
});
|
||||
conversation = this.conversations.add({
|
||||
id,
|
||||
type,
|
||||
version: 2,
|
||||
} as any);
|
||||
|
||||
const create = async () => {
|
||||
if (!conversation.isValid()) {
|
||||
const validationError = conversation.validationError || {};
|
||||
window.log.error(
|
||||
'Contact is not valid. Not saving, but adding to collection:',
|
||||
conversation.idForLogging(),
|
||||
validationError.stack
|
||||
);
|
||||
|
||||
return conversation;
|
||||
}
|
||||
}
|
||||
|
||||
public getContactProfileNameOrShortenedPubKey(pubKey: string): string {
|
||||
const conversation = ConversationController.getInstance().get(pubKey);
|
||||
if (!conversation) {
|
||||
return pubKey;
|
||||
}
|
||||
return conversation.getContactProfileNameOrShortenedPubKey();
|
||||
try {
|
||||
await window.Signal.Data.saveConversation(conversation.attributes, {
|
||||
Conversation: window.Whisper.Conversation,
|
||||
});
|
||||
} catch (error) {
|
||||
window.log.error(
|
||||
'Conversation save failed! ',
|
||||
id,
|
||||
type,
|
||||
'Error:',
|
||||
error && error.stack ? error.stack : error
|
||||
);
|
||||
throw error;
|
||||
}
|
||||
|
||||
return conversation;
|
||||
};
|
||||
|
||||
conversation.initialPromise = create();
|
||||
conversation.initialPromise.then(async () => {
|
||||
if (window.inboxStore) {
|
||||
conversation.on('change', this.updateReduxConvoChanged);
|
||||
window.inboxStore.dispatch(
|
||||
window.actionsCreators.conversationAdded(
|
||||
conversation.id,
|
||||
conversation.getProps()
|
||||
)
|
||||
);
|
||||
}
|
||||
if (!conversation.isPublic() && !conversation.isRss()) {
|
||||
await Promise.all([
|
||||
conversation.updateProfileAvatar(),
|
||||
// NOTE: we request snodes updating the cache, but ignore the result
|
||||
window.SnodePool.getSnodesFor(id),
|
||||
]);
|
||||
}
|
||||
});
|
||||
|
||||
return conversation;
|
||||
}
|
||||
|
||||
public getContactProfileNameOrShortenedPubKey(pubKey: string): string {
|
||||
const conversation = ConversationController.getInstance().get(pubKey);
|
||||
if (!conversation) {
|
||||
return pubKey;
|
||||
}
|
||||
return conversation.getContactProfileNameOrShortenedPubKey();
|
||||
}
|
||||
|
||||
public getContactProfileNameOrFullPubKey(pubKey: string): string {
|
||||
const conversation = this.conversations.get(pubKey);
|
||||
if (!conversation) {
|
||||
return pubKey;
|
||||
}
|
||||
return conversation.getContactProfileNameOrFullPubKey();
|
||||
public getContactProfileNameOrFullPubKey(pubKey: string): string {
|
||||
const conversation = this.conversations.get(pubKey);
|
||||
if (!conversation) {
|
||||
return pubKey;
|
||||
}
|
||||
return conversation.getContactProfileNameOrFullPubKey();
|
||||
}
|
||||
|
||||
public isMediumGroup(hexEncodedGroupPublicKey: string): boolean {
|
||||
const convo = this.conversations.get(hexEncodedGroupPublicKey);
|
||||
if (convo) {
|
||||
return convo.isMediumGroup();
|
||||
}
|
||||
return false;
|
||||
public isMediumGroup(hexEncodedGroupPublicKey: string): boolean {
|
||||
const convo = this.conversations.get(hexEncodedGroupPublicKey);
|
||||
if (convo) {
|
||||
return convo.isMediumGroup();
|
||||
}
|
||||
|
||||
public async getOrCreateAndWait(id: any, type: string) {
|
||||
const initialPromise = this._initialPromise !== undefined ? this._initialPromise : Promise.resolve();
|
||||
return initialPromise.then(() => {
|
||||
if (!id) {
|
||||
return Promise.reject(
|
||||
new Error('getOrCreateAndWait: invalid id passed.')
|
||||
);
|
||||
}
|
||||
const pubkey = id && id.key ? id.key : id;
|
||||
const conversation = this.getOrCreate(pubkey, type);
|
||||
|
||||
if (conversation) {
|
||||
return conversation.initialPromise.then(() => conversation);
|
||||
}
|
||||
|
||||
return Promise.reject(
|
||||
new Error('getOrCreateAndWait: did not get conversation')
|
||||
);
|
||||
});
|
||||
return false;
|
||||
}
|
||||
|
||||
public async getOrCreateAndWait(id: any, type: string) {
|
||||
const initialPromise =
|
||||
this._initialPromise !== undefined
|
||||
? this._initialPromise
|
||||
: Promise.resolve();
|
||||
return initialPromise.then(() => {
|
||||
if (!id) {
|
||||
return Promise.reject(
|
||||
new Error('getOrCreateAndWait: invalid id passed.')
|
||||
);
|
||||
}
|
||||
const pubkey = id && id.key ? id.key : id;
|
||||
const conversation = this.getOrCreate(pubkey, type);
|
||||
|
||||
if (conversation) {
|
||||
return conversation.initialPromise.then(() => conversation);
|
||||
}
|
||||
|
||||
return Promise.reject(
|
||||
new Error('getOrCreateAndWait: did not get conversation')
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
public async getAllGroupsInvolvingId(id: String) {
|
||||
const groups = await window.Signal.Data.getAllGroupsInvolvingId(id, {
|
||||
ConversationCollection: window.Whisper.ConversationCollection,
|
||||
});
|
||||
return groups.map((group: any) => this.conversations.add(group));
|
||||
}
|
||||
|
||||
public async deleteContact(id: string) {
|
||||
if (typeof id !== 'string') {
|
||||
throw new TypeError("'id' must be a string");
|
||||
}
|
||||
|
||||
public async getAllGroupsInvolvingId(id: String) {
|
||||
const groups = await window.Signal.Data.getAllGroupsInvolvingId(id, {
|
||||
ConversationCollection: window.Whisper.ConversationCollection,
|
||||
});
|
||||
return groups.map((group: any) => this.conversations.add(group));
|
||||
if (!this._initialFetchComplete) {
|
||||
throw new Error(
|
||||
'ConversationController.get() needs complete initial fetch'
|
||||
);
|
||||
}
|
||||
|
||||
public async deleteContact(id: string) {
|
||||
if (typeof id !== 'string') {
|
||||
throw new TypeError("'id' must be a string");
|
||||
}
|
||||
|
||||
if (!this._initialFetchComplete) {
|
||||
throw new Error(
|
||||
'ConversationController.get() needs complete initial fetch'
|
||||
);
|
||||
}
|
||||
|
||||
const conversation = this.conversations.get(id);
|
||||
if (!conversation) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Close group leaving
|
||||
if (conversation.isClosedGroup()) {
|
||||
await conversation.leaveGroup();
|
||||
} else if (conversation.isPublic()) {
|
||||
const channelAPI = await conversation.getPublicSendData();
|
||||
if (channelAPI === null) {
|
||||
window.log.warn(`Could not get API for public conversation ${id}`);
|
||||
} else {
|
||||
channelAPI.serverAPI.partChannel(channelAPI.channelId);
|
||||
}
|
||||
} else if (conversation.isPrivate()) {
|
||||
const deviceIds = await window.textsecure.storage.protocol.getDeviceIds(
|
||||
id
|
||||
);
|
||||
await Promise.all(
|
||||
deviceIds.map((deviceId: string) => {
|
||||
const address = new window.libsignal.SignalProtocolAddress(
|
||||
id,
|
||||
deviceId
|
||||
);
|
||||
const sessionCipher = new window.libsignal.SessionCipher(
|
||||
window.textsecure.storage.protocol,
|
||||
address
|
||||
);
|
||||
return sessionCipher.deleteAllSessionsForDevice();
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
await conversation.destroyMessages();
|
||||
|
||||
await window.Signal.Data.removeConversation(id, {
|
||||
Conversation: window.Whisper.Conversation,
|
||||
});
|
||||
conversation.off('change', this.updateReduxConvoChanged);
|
||||
this.conversations.remove(conversation);
|
||||
if (window.inboxStore) {
|
||||
window.inboxStore.dispatch(
|
||||
window.actionsCreators.conversationRemoved(conversation.id)
|
||||
);
|
||||
}
|
||||
const conversation = this.conversations.get(id);
|
||||
if (!conversation) {
|
||||
return;
|
||||
}
|
||||
|
||||
public getConversations(): Array<ConversationModel> {
|
||||
return Array.from(this.conversations.models.values());
|
||||
// Close group leaving
|
||||
if (conversation.isClosedGroup()) {
|
||||
await conversation.leaveGroup();
|
||||
} else if (conversation.isPublic()) {
|
||||
const channelAPI = await conversation.getPublicSendData();
|
||||
if (channelAPI === null) {
|
||||
window.log.warn(`Could not get API for public conversation ${id}`);
|
||||
} else {
|
||||
channelAPI.serverAPI.partChannel(channelAPI.channelId);
|
||||
}
|
||||
} else if (conversation.isPrivate()) {
|
||||
const deviceIds = await window.textsecure.storage.protocol.getDeviceIds(
|
||||
id
|
||||
);
|
||||
await Promise.all(
|
||||
deviceIds.map((deviceId: string) => {
|
||||
const address = new window.libsignal.SignalProtocolAddress(
|
||||
id,
|
||||
deviceId
|
||||
);
|
||||
const sessionCipher = new window.libsignal.SessionCipher(
|
||||
window.textsecure.storage.protocol,
|
||||
address
|
||||
);
|
||||
return sessionCipher.deleteAllSessionsForDevice();
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
public async load() {
|
||||
window.log.info('ConversationController: starting initial fetch');
|
||||
|
||||
if (this.conversations.length) {
|
||||
throw new Error('ConversationController: Already loaded!');
|
||||
}
|
||||
|
||||
const load = async () => {
|
||||
try {
|
||||
const collection = await window.Signal.Data.getAllConversations({
|
||||
ConversationCollection: window.Whisper.ConversationCollection,
|
||||
});
|
||||
|
||||
this.conversations.add(collection.models);
|
||||
|
||||
this._initialFetchComplete = true;
|
||||
const promises: any = [];
|
||||
this.conversations.forEach((conversation: ConversationModel) => {
|
||||
if (!conversation.get('lastMessage')) {
|
||||
// tslint:disable-next-line: no-void-expression
|
||||
promises.push(conversation.updateLastMessage());
|
||||
}
|
||||
|
||||
promises.concat([
|
||||
conversation.updateProfileName(),
|
||||
conversation.updateProfileAvatar(),
|
||||
]);
|
||||
});
|
||||
this.conversations.forEach((conversation: ConversationModel) => {
|
||||
// register for change event on each conversation, and forward to redux
|
||||
conversation.on('change', this.updateReduxConvoChanged);
|
||||
});
|
||||
await Promise.all(promises);
|
||||
|
||||
// Remove any unused images
|
||||
window.profileImages.removeImagesNotInArray(
|
||||
this.conversations.map((c: any) => c.id)
|
||||
);
|
||||
window.log.info('ConversationController: done with initial fetch');
|
||||
} catch (error) {
|
||||
window.log.error(
|
||||
'ConversationController: initial fetch failed',
|
||||
error && error.stack ? error.stack : error
|
||||
);
|
||||
throw error;
|
||||
}
|
||||
};
|
||||
await BlockedNumberController.load();
|
||||
|
||||
this._initialPromise = load();
|
||||
|
||||
return this._initialPromise;
|
||||
await conversation.destroyMessages();
|
||||
|
||||
await window.Signal.Data.removeConversation(id, {
|
||||
Conversation: window.Whisper.Conversation,
|
||||
});
|
||||
conversation.off('change', this.updateReduxConvoChanged);
|
||||
this.conversations.remove(conversation);
|
||||
if (window.inboxStore) {
|
||||
window.inboxStore.dispatch(
|
||||
window.actionsCreators.conversationRemoved(conversation.id)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
public loadPromise() {
|
||||
return this._initialPromise;
|
||||
}
|
||||
public reset() {
|
||||
this._initialPromise = Promise.resolve();
|
||||
this._initialFetchComplete = false;
|
||||
if (window.inboxStore) {
|
||||
this.conversations.forEach((convo: ConversationModel) =>
|
||||
convo.off('change', this.updateReduxConvoChanged)
|
||||
);
|
||||
|
||||
window.inboxStore.dispatch(
|
||||
window.actionsCreators.removeAllConversations()
|
||||
);
|
||||
}
|
||||
this.conversations.reset([]);
|
||||
public getConversations(): Array<ConversationModel> {
|
||||
return Array.from(this.conversations.models.values());
|
||||
}
|
||||
|
||||
public async load() {
|
||||
window.log.info('ConversationController: starting initial fetch');
|
||||
|
||||
if (this.conversations.length) {
|
||||
throw new Error('ConversationController: Already loaded!');
|
||||
}
|
||||
|
||||
private updateReduxConvoChanged(convo: ConversationModel) {
|
||||
if (window.inboxStore) {
|
||||
window.inboxStore.dispatch(
|
||||
window.actionsCreators.conversationChanged(convo.id, convo.getProps())
|
||||
);
|
||||
}
|
||||
const load = async () => {
|
||||
try {
|
||||
const collection = await window.Signal.Data.getAllConversations({
|
||||
ConversationCollection: window.Whisper.ConversationCollection,
|
||||
});
|
||||
|
||||
this.conversations.add(collection.models);
|
||||
|
||||
this._initialFetchComplete = true;
|
||||
const promises: any = [];
|
||||
this.conversations.forEach((conversation: ConversationModel) => {
|
||||
if (!conversation.get('lastMessage')) {
|
||||
// tslint:disable-next-line: no-void-expression
|
||||
promises.push(conversation.updateLastMessage());
|
||||
}
|
||||
|
||||
promises.concat([
|
||||
conversation.updateProfileName(),
|
||||
conversation.updateProfileAvatar(),
|
||||
]);
|
||||
});
|
||||
this.conversations.forEach((conversation: ConversationModel) => {
|
||||
// register for change event on each conversation, and forward to redux
|
||||
conversation.on('change', this.updateReduxConvoChanged);
|
||||
});
|
||||
await Promise.all(promises);
|
||||
|
||||
// Remove any unused images
|
||||
window.profileImages.removeImagesNotInArray(
|
||||
this.conversations.map((c: any) => c.id)
|
||||
);
|
||||
window.log.info('ConversationController: done with initial fetch');
|
||||
} catch (error) {
|
||||
window.log.error(
|
||||
'ConversationController: initial fetch failed',
|
||||
error && error.stack ? error.stack : error
|
||||
);
|
||||
throw error;
|
||||
}
|
||||
};
|
||||
await BlockedNumberController.load();
|
||||
|
||||
this._initialPromise = load();
|
||||
|
||||
return this._initialPromise;
|
||||
}
|
||||
|
||||
public loadPromise() {
|
||||
return this._initialPromise;
|
||||
}
|
||||
public reset() {
|
||||
this._initialPromise = Promise.resolve();
|
||||
this._initialFetchComplete = false;
|
||||
if (window.inboxStore) {
|
||||
this.conversations.forEach((convo: ConversationModel) =>
|
||||
convo.off('change', this.updateReduxConvoChanged)
|
||||
);
|
||||
|
||||
window.inboxStore.dispatch(
|
||||
window.actionsCreators.removeAllConversations()
|
||||
);
|
||||
}
|
||||
this.conversations.reset([]);
|
||||
}
|
||||
|
||||
private updateReduxConvoChanged(convo: ConversationModel) {
|
||||
if (window.inboxStore) {
|
||||
window.inboxStore.dispatch(
|
||||
window.actionsCreators.conversationChanged(convo.id, convo.getProps())
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue