Merge branch 'clearnet' into updater-reword
This commit is contained in:
commit
ce0848c8bf
|
@ -15,7 +15,7 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [windows-2016, macos-latest, ubuntu-18.04]
|
||||
os: [windows-2019, macos-latest, ubuntu-18.04]
|
||||
env:
|
||||
SIGNAL_ENV: production
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
|
|
@ -12,7 +12,7 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [windows-2016, macos-latest, ubuntu-18.04]
|
||||
os: [windows-2019, macos-latest, ubuntu-18.04]
|
||||
env:
|
||||
SIGNAL_ENV: production
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
|
|
@ -12,7 +12,7 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [windows-2016, macos-latest, ubuntu-18.04]
|
||||
os: [windows-2019, macos-latest, ubuntu-18.04]
|
||||
env:
|
||||
SIGNAL_ENV: production
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
|
|
@ -31,7 +31,7 @@ window.getNodeVersion = () => config.node_version;
|
|||
|
||||
window.sessionFeatureFlags = {
|
||||
useOnionRequests: true,
|
||||
useCallMessage: true,
|
||||
useCallMessage: false,
|
||||
};
|
||||
|
||||
window.versionInfo = {
|
||||
|
|
|
@ -41,5 +41,5 @@ export const Emojify = (props: Props): JSX.Element => {
|
|||
default:
|
||||
}
|
||||
|
||||
return <span style={{ fontSize: `${size}em` }}>{rendered}</span>;
|
||||
return <span style={{ fontSize: `${size}em`, userSelect: 'inherit' }}>{rendered}</span>;
|
||||
};
|
||||
|
|
|
@ -16,7 +16,7 @@ import {
|
|||
} from '../../util/accountManager';
|
||||
import { fromHex } from '../../session/utils/String';
|
||||
|
||||
export const MAX_USERNAME_LENGTH = 20;
|
||||
export const MAX_USERNAME_LENGTH = 26;
|
||||
// tslint:disable: use-simple-attributes
|
||||
|
||||
export async function resetRegistration() {
|
||||
|
|
|
@ -776,7 +776,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
|
|||
messageRequestResponse: {
|
||||
isApproved: 1,
|
||||
},
|
||||
unread: 1, // 1 means unread
|
||||
expireTimer: 0,
|
||||
});
|
||||
|
||||
|
@ -945,7 +944,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
|
|||
if (isOutgoing) {
|
||||
message = await this.addSingleOutgoingMessage({
|
||||
...commonAttributes,
|
||||
unread: 0,
|
||||
sent_at: timestamp,
|
||||
});
|
||||
} else {
|
||||
|
@ -1017,7 +1015,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
|
|||
public async addSingleOutgoingMessage(
|
||||
messageAttributes: Omit<
|
||||
MessageAttributesOptionals,
|
||||
'conversationId' | 'source' | 'type' | 'direction' | 'received_at'
|
||||
'conversationId' | 'source' | 'type' | 'direction' | 'received_at' | 'unread'
|
||||
>
|
||||
) {
|
||||
return this.addSingleMessage({
|
||||
|
@ -1026,6 +1024,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
|
|||
source: UserUtils.getOurPubKeyStrFromCache(),
|
||||
type: 'outgoing',
|
||||
direction: 'outgoing',
|
||||
unread: 0, // an outgoing message must be read right?
|
||||
received_at: messageAttributes.sent_at, // make sure to set an received_at timestamp for an outgoing message, so the order are right.
|
||||
});
|
||||
}
|
||||
|
|
|
@ -113,7 +113,7 @@ export async function handleClosedGroupControlMessage(
|
|||
if (type === Type.NEW) {
|
||||
if (
|
||||
!getConversationController()
|
||||
.get(envelope.senderIdentity)
|
||||
.get(envelope.senderIdentity || envelope.source)
|
||||
?.isApproved()
|
||||
) {
|
||||
window?.log?.info(
|
||||
|
@ -954,7 +954,7 @@ export async function createClosedGroup(groupName: string, members: Array<string
|
|||
UserUtils.getOurPubKeyStrFromCache(),
|
||||
Date.now()
|
||||
);
|
||||
|
||||
await convo.setIsApproved(true, false);
|
||||
// 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(groupDetails);
|
||||
|
|
|
@ -616,7 +616,8 @@ export async function handleDataExtractionNotification(
|
|||
const envelopeTimestamp = Lodash.toNumber(timestamp);
|
||||
const referencedAttachmentTimestamp = Lodash.toNumber(referencedAttachment);
|
||||
|
||||
await convo.addSingleOutgoingMessage({
|
||||
await convo.addSingleIncomingMessage({
|
||||
source,
|
||||
sent_at: envelopeTimestamp,
|
||||
dataExtractionNotification: {
|
||||
type,
|
||||
|
|
|
@ -174,7 +174,6 @@ export async function addUpdateMessage(
|
|||
const outgoingMessage = await convo.addSingleOutgoingMessage({
|
||||
sent_at: sentAt,
|
||||
group_update: groupUpdate,
|
||||
unread: 1,
|
||||
expireTimer: 0,
|
||||
});
|
||||
return outgoingMessage;
|
||||
|
|
|
@ -503,7 +503,6 @@ export async function USER_callRecipient(recipient: string) {
|
|||
sent_at: now,
|
||||
expireTimer: 0,
|
||||
callNotificationType: 'started-call',
|
||||
unread: 0,
|
||||
});
|
||||
|
||||
// initiating a call is analgous to sending a message request
|
||||
|
|
|
@ -352,7 +352,7 @@ export const _getLeftPaneLists = (
|
|||
directConversations.push(conversation);
|
||||
}
|
||||
|
||||
if (!conversation.isApproved) {
|
||||
if (!conversation.isApproved && conversation.isPrivate) {
|
||||
// dont increase unread counter, don't push to convo list.
|
||||
continue;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue