Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ percent-encoding = "2"
# Enables `stream` (for native_upload's `Body::wrap_stream`) on the reqwest that
# tauri-plugin-http pulls in without it. default-features = false keeps
# openssl-sys out of the Android cross-compile.
reqwest = { version = "0.13", default-features = false, features = ["stream"] }
reqwest = { version = "0.12", default-features = false, features = ["stream"] }
async-stream = "0.3"
base64 = "0.23"
tokio-util = { version = "0.7", features = ["codec"] }
Expand Down
6 changes: 3 additions & 3 deletions src-tauri/src/network/native_upload.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ use std::{

use base64::Engine;
use futures_util::StreamExt;
use reqwest::{
use serde::Serialize;
use tauri::{ipc::Channel, AppHandle, Manager, Runtime};
use tauri_plugin_http::reqwest::{
header::{AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE},
Body, Client, ClientBuilder, Method, Url,
};
use serde::Serialize;
use tauri::{ipc::Channel, AppHandle, Manager, Runtime};
use tokio::{
fs::{File, OpenOptions},
io::AsyncWriteExt,
Expand Down
69 changes: 37 additions & 32 deletions src/app/features/room/RoomInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -607,16 +607,50 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
const dropZoneVisible = useFileDropZone(fileDropContainerRef, handleFiles);
const [hasText, setHasText] = useState(false);
const lastEncryptionPreparationAt = useRef(0);
const detectAutocomplete = useCallback(() => {
const firstPosition = Editor.start(editor, []);
const secondChar = Editor.after(editor, firstPosition, {
distance: 2,
unit: 'character',
});
const quickReactPrefix = Editor.string(
editor,
Editor.range(editor, firstPosition, secondChar)
);
if (quickReactPrefix === '+#') {
setQuickTextReact(true);
setAutocompleteQuery(undefined);
return;
}
setQuickTextReact(false);

const prevWordRange = getPrevWorldRange(editor);
if (!prevWordRange) {
setAutocompleteQuery(undefined);
return;
}

const isRangeAtBeginning = !Point.isAfter(Range.start(prevWordRange), firstPosition);
const query =
(isRangeAtBeginning
? getAutocompleteQuery(editor, prevWordRange, BEGINNING_AUTOCOMPLETE_PREFIXES)
: undefined) ??
getAutocompleteQuery(editor, prevWordRange, ANYWHERE_AUTOCOMPLETE_PREFIXES);

setAutocompleteQuery(query);
}, [editor]);

const handleEditorChange = useCallback(() => {
setHasText(!isEmptyEditor(editor));
detectAutocomplete();
if (!room.hasEncryptionStateEvent()) return;

const now = Date.now();
if (now - lastEncryptionPreparationAt.current < ENCRYPTION_PREPARATION_INTERVAL_MS) return;

lastEncryptionPreparationAt.current = now;
mx.getCrypto()?.prepareToEncrypt(room);
}, [editor, mx, room]);
}, [editor, detectAutocomplete, mx, room]);
const hasContent = hasText || selectedFiles.length > 0;

const isComposing = useComposingCheck();
Expand Down Expand Up @@ -1774,38 +1808,9 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
sendTypingStatus(!isEmptyEditor(editor));
}

const firstPosition = Editor.start(editor, []);
const secondChar = Editor.after(editor, firstPosition, {
distance: 2,
unit: 'character',
});
const quickReactPrefix = Editor.string(
editor,
Editor.range(editor, firstPosition, secondChar)
);
if (quickReactPrefix === '+#') {
setQuickTextReact(true);
setAutocompleteQuery(undefined);
return;
}
setQuickTextReact(false);

const prevWordRange = getPrevWorldRange(editor);
if (!prevWordRange) {
setAutocompleteQuery(undefined);
return;
}

const isRangeAtBeginning = !Point.isAfter(Range.start(prevWordRange), firstPosition);
const query =
(isRangeAtBeginning
? getAutocompleteQuery(editor, prevWordRange, BEGINNING_AUTOCOMPLETE_PREFIXES)
: undefined) ??
getAutocompleteQuery(editor, prevWordRange, ANYWHERE_AUTOCOMPLETE_PREFIXES);

setAutocompleteQuery(query);
detectAutocomplete();
},
[editor, sendTypingStatus, hideActivity]
[editor, sendTypingStatus, hideActivity, detectAutocomplete]
);

const handleEmoticonSelect = (key: string, shortcode: string) => {
Expand Down
16 changes: 10 additions & 6 deletions src/app/features/room/message/MessageEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -337,20 +337,24 @@ export const MessageEditor = as<'div', MessageEditorProps>(
[enterForNewline, isComposing, editor, handleSave, onCancel]
);

const detectAutocomplete = useCallback(() => {
const prevWordRange = getPrevWorldRange(editor);
const query = prevWordRange
? getAutocompleteQuery(editor, prevWordRange, ANYWHERE_AUTOCOMPLETE_PREFIXES)
: undefined;
setAutocompleteQuery(query);
}, [editor]);

const handleKeyUp: KeyboardEventHandler = useCallback(
(evt) => {
if (isKeyHotkey('escape', evt)) {
evt.preventDefault();
return;
}

const prevWordRange = getPrevWorldRange(editor);
const query = prevWordRange
? getAutocompleteQuery(editor, prevWordRange, ANYWHERE_AUTOCOMPLETE_PREFIXES)
: undefined;
setAutocompleteQuery(query);
detectAutocomplete();
},
[editor]
[detectAutocomplete]
);

const handleCloseAutocomplete = useCallback(() => {
Expand Down
Loading