keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

chore: lint, dedup yarn.lock & address PR comments

Browse Source
pull/3281/head
Audric Ackermann 11 months ago
parent acc6e84627
commit df73ce6798
No known key found for this signature in database
5 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File

1
ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx
Unescape Escape View File

@ -244,6 +244,7 @@ const DeleteGroupPanelButton = () => {
if (!showItem || !convoId) { if (!showItem || !convoId) {
return null; return null;
} }
const token = PubKey.is03Pubkey(convoId) ? 'groupDelete' : 'conversationsDelete'; const token = PubKey.is03Pubkey(convoId) ? 'groupDelete' : 'conversationsDelete';
return ( return (

1
ts/components/menu/items/RetrySend/RetrySendMenuItem.tsx
Unescape Escape View File

@ -11,6 +11,7 @@ export const RetryItem = ({ messageId }: WithMessageId) => {
const isOutgoing = direction === 'outgoing'; const isOutgoing = direction === 'outgoing';
const showRetry = status === 'error' && isOutgoing; const showRetry = status === 'error' && isOutgoing;
const onRetry = useCallback(async () => { const onRetry = useCallback(async () => {
const found = await Data.getMessageById(messageId); const found = await Data.getMessageById(messageId);
if (found) { if (found) {

1
ts/models/conversation.ts
Unescape Escape View File

@ -795,6 +795,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
const messageRequestResponse = new MessageRequestResponse(messageRequestResponseParams); const messageRequestResponse = new MessageRequestResponse(messageRequestResponseParams);
const pubkeyForSending = new PubKey(this.id); const pubkeyForSending = new PubKey(this.id);
window.log.info(`Sending message request accepted message to ${PubKey.shorten(this.id)}`);
await MessageQueue.use() await MessageQueue.use()
.sendToPubKey(pubkeyForSending, messageRequestResponse, SnodeNamespaces.Default) .sendToPubKey(pubkeyForSending, messageRequestResponse, SnodeNamespaces.Default)
.catch(window?.log?.error); .catch(window?.log?.error);

2
ts/session/conversations/ConversationController.ts
Unescape Escape View File

@ -274,7 +274,7 @@ class ConvoController {
`deleteGroup: ${ed25519Str(groupPk)}, sendLeaveMessage:${sendLeaveMessage}, fromSyncMessage:${fromSyncMessage}, deletionType:${deletionType}, deleteAllMessagesOnSwarm:${deleteAllMessagesOnSwarm}, forceDestroyForAllMembers:${forceDestroyForAllMembers}, clearFetchedHashes:${clearFetchedHashes}` `deleteGroup: ${ed25519Str(groupPk)}, sendLeaveMessage:${sendLeaveMessage}, fromSyncMessage:${fromSyncMessage}, deletionType:${deletionType}, deleteAllMessagesOnSwarm:${deleteAllMessagesOnSwarm}, forceDestroyForAllMembers:${forceDestroyForAllMembers}, clearFetchedHashes:${clearFetchedHashes}`
); );
// Keep the messages until we have effectively left the group (and managed to send our leave message)m // Keep the messages until we have effectively left the group (and managed to send our leave message)
// because we have the "Leaving..." state (left pane) linked to the last message in conversation. // because we have the "Leaving..." state (left pane) linked to the last message in conversation.
const conversation = await this.deleteConvoInitialChecks(groupPk, 'Group', true); const conversation = await this.deleteConvoInitialChecks(groupPk, 'Group', true);
if (!conversation || !conversation.isClosedGroup()) { if (!conversation || !conversation.isClosedGroup()) {

15
yarn.lock
Unescape Escape View File

@ -2646,10 +2646,10 @@ date-fns@^3.6.0:
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-3.6.0.tgz#f20ca4fe94f8b754951b24240676e8618c0206bf" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-3.6.0.tgz#f20ca4fe94f8b754951b24240676e8618c0206bf"
integrity sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww== integrity sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==
debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: debug@4, debug@^4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
version "4.3.7" version "4.4.0"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52" resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ== integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
dependencies: dependencies:
ms "^2.1.3" ms "^2.1.3"
@ -2674,13 +2674,6 @@ debug@^3.2.7:
dependencies: dependencies:
ms "^2.1.1" ms "^2.1.1"
debug@^4:
version "4.4.0"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
dependencies:
ms "^2.1.3"
decamelize-keys@^1.1.0: decamelize-keys@^1.1.0:
version "1.1.1" version "1.1.1"
resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8" resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"

Write Preview
Loading…
Cancel
Save