fix color of opengroup invitation

pull/2242/head
Audric Ackermann 3 years ago
parent 6001da5ac8
commit e11775a2e0
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4

@ -55,15 +55,10 @@
flex-direction: column; flex-direction: column;
padding: 0px 12px; padding: 0px 12px;
color: var(--color-text-opposite);
.group-name { .group-name {
font-weight: bold; font-weight: bold;
font-size: 18px; font-size: 18px;
} }
.group-address {
color: var(--color-text);
}
} }
.session-icon-button { .session-icon-button {
@ -79,3 +74,15 @@
} }
} }
} }
.group-invitation {
.group-details {
color: var(--color-received-message-text);
}
}
.group-invitation.invitation-outgoing {
.group-details {
color: var(--color-sent-message-text);
}
}

@ -72,7 +72,7 @@ export async function handleOpenGroupV2Message(
? createPublicMessageSentFromUs(commonAttributes) ? createPublicMessageSentFromUs(commonAttributes)
: createPublicMessageSentFromNotUs(attributesForNotUs); : createPublicMessageSentFromNotUs(attributesForNotUs);
// Note, deduplication is made in filterDuplicatesFromDbAndIncoming now // Note: deduplication is made in filterDuplicatesFromDbAndIncoming now
await handleMessageJob( await handleMessageJob(
msgModel, msgModel,

@ -11,7 +11,7 @@ import {
ParsedMemberCount, ParsedMemberCount,
ParsedRoomCompactPollResults, ParsedRoomCompactPollResults,
} from './OpenGroupAPIV2CompactPoll'; } from './OpenGroupAPIV2CompactPoll';
import _ from 'lodash'; import _, { now } from 'lodash';
import { ConversationModel } from '../../../../models/conversation'; import { ConversationModel } from '../../../../models/conversation';
import { getMessageIdsFromServerIds, removeMessage } from '../../../../data/data'; import { getMessageIdsFromServerIds, removeMessage } from '../../../../data/data';
import { getV2OpenGroupRoom, saveV2OpenGroupRoom } from '../../../../data/opengroups'; import { getV2OpenGroupRoom, saveV2OpenGroupRoom } from '../../../../data/opengroups';
@ -423,6 +423,7 @@ const handleNewMessages = async (
// this call filters duplicates based on the sender & senttimestamp from the incoming messages array and the database // this call filters duplicates based on the sender & senttimestamp from the incoming messages array and the database
const filteredDuplicates = await filterDuplicatesFromDbAndIncoming(newMessages); const filteredDuplicates = await filterDuplicatesFromDbAndIncoming(newMessages);
const startHandleOpengroupMessage = now();
// tslint:disable-next-line: prefer-for-of // tslint:disable-next-line: prefer-for-of
for (let index = 0; index < filteredDuplicates.length; index++) { for (let index = 0; index < filteredDuplicates.length; index++) {
const newMessage = filteredDuplicates[index]; const newMessage = filteredDuplicates[index];
@ -433,6 +434,11 @@ const handleNewMessages = async (
} }
} }
window.log.debug(
`[perf] handle ${filteredDuplicates.length} opengroupMessages took ${now() -
startHandleOpengroupMessage}ms.`
);
// we need to update the timestamp even if we don't have a new MaxMessageServerId // we need to update the timestamp even if we don't have a new MaxMessageServerId
if (roomInfos) { if (roomInfos) {
roomInfos.lastMessageFetchedServerID = maxNewMessageId; roomInfos.lastMessageFetchedServerID = maxNewMessageId;

@ -1,4 +1,4 @@
describe('Updater', () => { describe('Updater', () => {
// tslint:disable-next-line: no-empty // tslint:disable-next-line: no-empty
it.skip('updater test', () => {}); it.skip('isUpdateAvailable', () => {});
}); });

Loading…
Cancel
Save