Compare commits
24 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5c18e38314 | ||
| 64e1de954a | |||
|
|
0404cdc8ee | ||
| 9dc177f527 | |||
| 655603bb59 | |||
|
|
fb9e8bc277 | ||
| 803a076f98 | |||
| 86d284b353 | |||
| 6207d18b3c | |||
|
|
8d2e35d1bc | ||
| 6845398755 | |||
| be52b0fa08 | |||
|
|
298bcfd1e3 | ||
| fce1736312 | |||
|
|
e11304d093 | ||
| 60d76d5165 | |||
|
|
373e700a07 | ||
| f7b25261cc | |||
|
|
41e1b0db9d | ||
| d1022635d2 | |||
|
|
2e6be4b0b3 | ||
| 0d97676edd | |||
|
|
f8e8058de3 | ||
| a1577a3b97 |
@@ -27,8 +27,8 @@ android {
|
|||||||
applicationId "com.paarrot.app"
|
applicationId "com.paarrot.app"
|
||||||
minSdkVersion rootProject.ext.minSdkVersion
|
minSdkVersion rootProject.ext.minSdkVersion
|
||||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||||
versionCode 1777176952
|
versionCode 1783526741
|
||||||
versionName "2026-04-26.041552.151"
|
versionName "2026-07-08.160541.766"
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
aaptOptions {
|
aaptOptions {
|
||||||
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ public class MainActivity extends BridgeActivity {
|
|||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
registerPlugin(SyncServicePlugin.class);
|
registerPlugin(SyncServicePlugin.class);
|
||||||
registerPlugin(ShareHandlerPlugin.class);
|
registerPlugin(ShareHandlerPlugin.class);
|
||||||
|
registerPlugin(PluginStoragePlugin.class);
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
250
android/app/src/main/java/com/paarrot/app/PluginStoragePlugin.kt
Normal file
250
android/app/src/main/java/com/paarrot/app/PluginStoragePlugin.kt
Normal file
@@ -0,0 +1,250 @@
|
|||||||
|
package com.paarrot.app
|
||||||
|
|
||||||
|
import com.getcapacitor.JSArray
|
||||||
|
import com.getcapacitor.JSObject
|
||||||
|
import com.getcapacitor.Plugin
|
||||||
|
import com.getcapacitor.PluginCall
|
||||||
|
import com.getcapacitor.PluginMethod
|
||||||
|
import com.getcapacitor.annotation.CapacitorPlugin
|
||||||
|
import org.json.JSONArray
|
||||||
|
import org.json.JSONObject
|
||||||
|
import java.io.File
|
||||||
|
import java.io.FileOutputStream
|
||||||
|
import java.net.HttpURLConnection
|
||||||
|
import java.net.URL
|
||||||
|
import java.text.SimpleDateFormat
|
||||||
|
import java.util.Date
|
||||||
|
import java.util.Locale
|
||||||
|
import java.util.zip.ZipInputStream
|
||||||
|
|
||||||
|
/** Capacitor plugin that stores and manages user extension plugins on Android. */
|
||||||
|
@CapacitorPlugin(name = "PluginStorage")
|
||||||
|
class PluginStoragePlugin : Plugin() {
|
||||||
|
|
||||||
|
private fun pluginsDir(): File {
|
||||||
|
val dir = File(context.filesDir, "plugins")
|
||||||
|
dir.mkdirs()
|
||||||
|
return dir
|
||||||
|
}
|
||||||
|
|
||||||
|
@PluginMethod
|
||||||
|
fun getPath(call: PluginCall) {
|
||||||
|
val result = JSObject()
|
||||||
|
result.put("success", true)
|
||||||
|
result.put("data", pluginsDir().absolutePath)
|
||||||
|
call.resolve(result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@PluginMethod
|
||||||
|
fun list(call: PluginCall) {
|
||||||
|
try {
|
||||||
|
val plugins = pluginsDir().listFiles()?.filter { it.isDirectory } ?: emptyList()
|
||||||
|
val array = JSArray()
|
||||||
|
|
||||||
|
for (dir in plugins) {
|
||||||
|
val metadata = readMetadata(dir)
|
||||||
|
val obj = JSObject()
|
||||||
|
obj.put("id", dir.name)
|
||||||
|
obj.put("name", metadata?.optString("name", dir.name) ?: dir.name)
|
||||||
|
obj.put("version", metadata?.optString("version", "") ?: "")
|
||||||
|
obj.put("description", metadata?.optString("description", "") ?: "")
|
||||||
|
obj.put("author", metadata?.optString("author", "") ?: "")
|
||||||
|
obj.put("repository", metadata?.optString("repository", "") ?: "")
|
||||||
|
obj.put("thumbnail", metadata?.optString("thumbnail", "") ?: "")
|
||||||
|
obj.put("homepage", metadata?.optString("homepage", "") ?: "")
|
||||||
|
obj.put("tags", metadataTagsToJsArray(metadata))
|
||||||
|
obj.put("installedDate", formatInstalledDate(dir.lastModified()))
|
||||||
|
obj.put("path", dir.absolutePath)
|
||||||
|
array.put(obj)
|
||||||
|
}
|
||||||
|
|
||||||
|
val result = JSObject()
|
||||||
|
result.put("success", true)
|
||||||
|
result.put("data", array)
|
||||||
|
call.resolve(result)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
val result = JSObject()
|
||||||
|
result.put("success", false)
|
||||||
|
result.put("error", e.message ?: "Failed to list plugins")
|
||||||
|
call.resolve(result)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@PluginMethod
|
||||||
|
fun download(call: PluginCall) {
|
||||||
|
val pluginId = call.getString("pluginId")
|
||||||
|
?: return call.reject("pluginId required")
|
||||||
|
val downloadUrl = call.getString("downloadUrl")
|
||||||
|
?: return call.reject("downloadUrl required")
|
||||||
|
val name = call.getString("name") ?: pluginId
|
||||||
|
|
||||||
|
Thread {
|
||||||
|
try {
|
||||||
|
val destDir = File(pluginsDir(), pluginId)
|
||||||
|
if (destDir.exists()) {
|
||||||
|
destDir.deleteRecursively()
|
||||||
|
}
|
||||||
|
destDir.mkdirs()
|
||||||
|
|
||||||
|
val tempZip = File(context.cacheDir, "plugin-download-$pluginId.zip")
|
||||||
|
downloadFile(downloadUrl, tempZip)
|
||||||
|
extractZip(tempZip, destDir)
|
||||||
|
tempZip.delete()
|
||||||
|
|
||||||
|
normalisePluginLayout(destDir)
|
||||||
|
|
||||||
|
if (!File(destDir, "index.js").exists()) {
|
||||||
|
val result = JSObject()
|
||||||
|
result.put("success", false)
|
||||||
|
result.put("error", "Downloaded plugin is missing index.js")
|
||||||
|
call.resolve(result)
|
||||||
|
return@Thread
|
||||||
|
}
|
||||||
|
|
||||||
|
val result = JSObject()
|
||||||
|
result.put("success", true)
|
||||||
|
val data = JSObject()
|
||||||
|
data.put("path", destDir.absolutePath)
|
||||||
|
result.put("data", data)
|
||||||
|
call.resolve(result)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
val result = JSObject()
|
||||||
|
result.put("success", false)
|
||||||
|
result.put("error", e.message ?: "Failed to download plugin: $name")
|
||||||
|
call.resolve(result)
|
||||||
|
}
|
||||||
|
}.start()
|
||||||
|
}
|
||||||
|
|
||||||
|
@PluginMethod
|
||||||
|
fun uninstall(call: PluginCall) {
|
||||||
|
val pluginId = call.getString("pluginId")
|
||||||
|
?: return call.reject("pluginId required")
|
||||||
|
|
||||||
|
try {
|
||||||
|
val destDir = File(pluginsDir(), pluginId)
|
||||||
|
if (destDir.exists()) {
|
||||||
|
destDir.deleteRecursively()
|
||||||
|
}
|
||||||
|
|
||||||
|
val result = JSObject()
|
||||||
|
result.put("success", true)
|
||||||
|
call.resolve(result)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
val result = JSObject()
|
||||||
|
result.put("success", false)
|
||||||
|
result.put("error", e.message ?: "Failed to uninstall plugin")
|
||||||
|
call.resolve(result)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@PluginMethod
|
||||||
|
fun readPluginCode(call: PluginCall) {
|
||||||
|
val pluginId = call.getString("pluginId")
|
||||||
|
?: return call.reject("pluginId required")
|
||||||
|
|
||||||
|
val indexFile = File(pluginsDir(), "$pluginId/index.js")
|
||||||
|
if (!indexFile.exists()) {
|
||||||
|
val result = JSObject()
|
||||||
|
result.put("success", false)
|
||||||
|
result.put("error", "Plugin not found: $pluginId")
|
||||||
|
call.resolve(result)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
val result = JSObject()
|
||||||
|
result.put("success", true)
|
||||||
|
result.put("data", indexFile.readText())
|
||||||
|
call.resolve(result)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun readMetadata(pluginDir: File): JSONObject? {
|
||||||
|
val metadataFile = File(pluginDir, "plugin-metadata.json")
|
||||||
|
if (!metadataFile.exists()) return null
|
||||||
|
|
||||||
|
return try {
|
||||||
|
JSONObject(metadataFile.readText())
|
||||||
|
} catch (_: Exception) {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun metadataTagsToJsArray(metadata: JSONObject?): JSArray {
|
||||||
|
val tags = JSArray()
|
||||||
|
val jsonTags = metadata?.optJSONArray("tags") ?: return tags
|
||||||
|
for (i in 0 until jsonTags.length()) {
|
||||||
|
tags.put(jsonTags.optString(i))
|
||||||
|
}
|
||||||
|
return tags
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun formatInstalledDate(timestamp: Long): String {
|
||||||
|
val formatter = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US)
|
||||||
|
return formatter.format(Date(timestamp))
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun downloadFile(downloadUrl: String, destFile: File) {
|
||||||
|
val connection = (URL(downloadUrl).openConnection() as HttpURLConnection).apply {
|
||||||
|
connectTimeout = 30_000
|
||||||
|
readTimeout = 60_000
|
||||||
|
instanceFollowRedirects = true
|
||||||
|
requestMethod = "GET"
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
connection.connect()
|
||||||
|
if (connection.responseCode !in 200..299) {
|
||||||
|
throw IllegalStateException("HTTP ${connection.responseCode}")
|
||||||
|
}
|
||||||
|
|
||||||
|
connection.inputStream.use { input ->
|
||||||
|
FileOutputStream(destFile).use { output ->
|
||||||
|
input.copyTo(output)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
connection.disconnect()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun extractZip(zipFile: File, destDir: File) {
|
||||||
|
destDir.mkdirs()
|
||||||
|
val destPath = destDir.canonicalPath + File.separator
|
||||||
|
|
||||||
|
ZipInputStream(zipFile.inputStream()).use { zipInput ->
|
||||||
|
var entry = zipInput.nextEntry
|
||||||
|
while (entry != null) {
|
||||||
|
val outFile = File(destDir, entry.name)
|
||||||
|
if (!outFile.canonicalPath.startsWith(destPath)) {
|
||||||
|
throw SecurityException("Zip entry outside target directory")
|
||||||
|
}
|
||||||
|
|
||||||
|
if (entry.isDirectory) {
|
||||||
|
outFile.mkdirs()
|
||||||
|
} else {
|
||||||
|
outFile.parentFile?.mkdirs()
|
||||||
|
FileOutputStream(outFile).use { output ->
|
||||||
|
zipInput.copyTo(output)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
zipInput.closeEntry()
|
||||||
|
entry = zipInput.nextEntry
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Flatten single-root zip layouts so index.js ends up directly under the plugin dir. */
|
||||||
|
private fun normalisePluginLayout(destDir: File) {
|
||||||
|
if (File(destDir, "index.js").exists()) return
|
||||||
|
|
||||||
|
val children = destDir.listFiles()?.filter { it.isDirectory } ?: return
|
||||||
|
if (children.size != 1) return
|
||||||
|
|
||||||
|
val nested = children[0]
|
||||||
|
nested.listFiles()?.forEach { child ->
|
||||||
|
child.renameTo(File(destDir, child.name))
|
||||||
|
}
|
||||||
|
nested.deleteRecursively()
|
||||||
|
}
|
||||||
|
}
|
||||||
2
cinny
2
cinny
Submodule cinny updated: 7ef9939d8a...b4258278d8
@@ -18,6 +18,7 @@ import {
|
|||||||
RenderLeafProps,
|
RenderLeafProps,
|
||||||
RenderElementProps,
|
RenderElementProps,
|
||||||
RenderPlaceholderProps,
|
RenderPlaceholderProps,
|
||||||
|
ReactEditor,
|
||||||
} from 'slate-react';
|
} from 'slate-react';
|
||||||
import { withHistory } from 'slate-history';
|
import { withHistory } from 'slate-history';
|
||||||
import { BlockType } from './types';
|
import { BlockType } from './types';
|
||||||
@@ -172,27 +173,44 @@ export const CustomEditor = forwardRef<HTMLDivElement, CustomEditorProps>(
|
|||||||
const handleBeforeInput = useCallback(
|
const handleBeforeInput = useCallback(
|
||||||
(event: Event) => {
|
(event: Event) => {
|
||||||
const inputEvent = event as InputEvent;
|
const inputEvent = event as InputEvent;
|
||||||
|
|
||||||
// Handle autocorrect replacement that causes text duplication
|
// Handle mobile autocorrect replacement that causes text duplication in Slate
|
||||||
if (inputEvent.inputType === 'insertReplacementText' ||
|
if (inputEvent.inputType === 'insertReplacementText') {
|
||||||
inputEvent.inputType === 'insertFromComposition') {
|
const data = inputEvent.data || inputEvent.dataTransfer?.getData('text/plain');
|
||||||
|
if (!data) return;
|
||||||
|
|
||||||
|
event.preventDefault();
|
||||||
|
|
||||||
|
const domRanges = inputEvent.getTargetRanges?.() ?? [];
|
||||||
|
if (domRanges.length > 0) {
|
||||||
|
const slateRange = ReactEditor.toSlateRange(editor, domRanges[0], {
|
||||||
|
exactMatch: false,
|
||||||
|
suppressThrow: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (slateRange) {
|
||||||
|
Transforms.select(editor, slateRange);
|
||||||
|
Transforms.delete(editor);
|
||||||
|
editor.insertText(data);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const { selection } = editor;
|
const { selection } = editor;
|
||||||
if (!selection) return;
|
if (!selection) return;
|
||||||
|
|
||||||
// Get the data being inserted
|
if (!Range.isCollapsed(selection)) {
|
||||||
const data = inputEvent.data || inputEvent.dataTransfer?.getData('text/plain');
|
Transforms.delete(editor, { at: selection });
|
||||||
|
} else {
|
||||||
if (data) {
|
const wordBefore = Editor.before(editor, selection.anchor, { unit: 'word' });
|
||||||
event.preventDefault();
|
if (wordBefore) {
|
||||||
|
const wordRange = { anchor: wordBefore, focus: selection.anchor };
|
||||||
// If there's selected text, delete it first
|
Transforms.select(editor, wordRange);
|
||||||
if (selection && !Range.isCollapsed(selection)) {
|
Transforms.delete(editor);
|
||||||
Transforms.delete(editor, { at: selection });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Insert the replacement text
|
|
||||||
editor.insertText(data);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
editor.insertText(data);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
[editor]
|
[editor]
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import FocusTrap from 'focus-trap-react';
|
|||||||
import {
|
import {
|
||||||
Avatar,
|
Avatar,
|
||||||
Box,
|
Box,
|
||||||
|
Button,
|
||||||
Header,
|
Header,
|
||||||
Icon,
|
Icon,
|
||||||
IconButton,
|
IconButton,
|
||||||
@@ -62,6 +63,7 @@ export function ShareRoomPicker({ share, onPick, onDismiss }: ShareRoomPickerPro
|
|||||||
const mx = useMatrixClient();
|
const mx = useMatrixClient();
|
||||||
const useAuthentication = useMediaAuthentication();
|
const useAuthentication = useMediaAuthentication();
|
||||||
const scrollRef = useRef<HTMLDivElement>(null);
|
const scrollRef = useRef<HTMLDivElement>(null);
|
||||||
|
const [confirmRoomId, setConfirmRoomId] = useState<string | null>(null);
|
||||||
|
|
||||||
const mDirects = useAtomValue(mDirectAtom);
|
const mDirects = useAtomValue(mDirectAtom);
|
||||||
const allRoomsSet = useAllJoinedRoomsSet();
|
const allRoomsSet = useAllJoinedRoomsSet();
|
||||||
@@ -107,149 +109,208 @@ export function ShareRoomPicker({ share, onPick, onDismiss }: ShareRoomPickerPro
|
|||||||
const handleRoomClick: React.MouseEventHandler<HTMLButtonElement> = (evt) => {
|
const handleRoomClick: React.MouseEventHandler<HTMLButtonElement> = (evt) => {
|
||||||
const roomId = evt.currentTarget.getAttribute('data-room-id');
|
const roomId = evt.currentTarget.getAttribute('data-room-id');
|
||||||
if (roomId) {
|
if (roomId) {
|
||||||
onPick(roomId);
|
setConfirmRoomId(roomId);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleConfirm = useCallback(() => {
|
||||||
|
if (confirmRoomId) {
|
||||||
|
onPick(confirmRoomId);
|
||||||
|
}
|
||||||
|
}, [confirmRoomId, onPick]);
|
||||||
|
|
||||||
|
const handleCancelConfirm = useCallback(() => {
|
||||||
|
setConfirmRoomId(null);
|
||||||
|
}, []);
|
||||||
|
|
||||||
const previewText = share.text?.slice(0, 80) ?? share.subject?.slice(0, 80);
|
const previewText = share.text?.slice(0, 80) ?? share.subject?.slice(0, 80);
|
||||||
const fileCount = share.files.length;
|
const fileCount = share.files.length;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Overlay open backdrop={<OverlayBackdrop />}>
|
<>
|
||||||
<OverlayCenter>
|
<Overlay open>
|
||||||
<FocusTrap
|
<FocusTrap
|
||||||
focusTrapOptions={{
|
focusTrapOptions={{
|
||||||
initialFocus: false,
|
initialFocus: false,
|
||||||
clickOutsideDeactivates: true,
|
clickOutsideDeactivates: true,
|
||||||
onDeactivate: onDismiss,
|
onDeactivate: onDismiss,
|
||||||
escapeDeactivates: stopPropagation,
|
escapeDeactivates: stopPropagation,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Box
|
||||||
|
grow="Yes"
|
||||||
|
direction="Column"
|
||||||
|
style={{
|
||||||
|
position: 'fixed',
|
||||||
|
inset: 0,
|
||||||
|
zIndex: 999,
|
||||||
|
backgroundColor: '#1a1d23',
|
||||||
|
paddingTop: '60px',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Modal size="300">
|
<Header
|
||||||
<Box grow="Yes" direction="Column" style={{ maxHeight: '85vh' }}>
|
size="500"
|
||||||
<Header
|
style={{ padding: config.space.S400 }}
|
||||||
size="500"
|
>
|
||||||
style={{ padding: config.space.S200, paddingLeft: config.space.S400 }}
|
<Box grow="Yes" direction="Column" gap="100" style={{ minWidth: 0, maxWidth: '80%' }}>
|
||||||
>
|
<Text size="H4">Share to Room</Text>
|
||||||
<Box grow="Yes" direction="Column" gap="100">
|
{(previewText || fileCount > 0) && (
|
||||||
<Text size="H4">Share to Room</Text>
|
<Text size="T200" priority="300" style={{ opacity: 0.7, wordBreak: 'break-word', whiteSpace: 'normal' }}>
|
||||||
{(previewText || fileCount > 0) && (
|
{previewText
|
||||||
<Text size="T200" priority="300" style={{ opacity: 0.7 }}>
|
? `"${previewText}${(share.text?.length ?? 0) > 80 ? '…' : ''}"`
|
||||||
{previewText
|
: `${fileCount} file${fileCount !== 1 ? 's' : ''}`}
|
||||||
? `"${previewText}${(share.text?.length ?? 0) > 80 ? '…' : ''}"`
|
</Text>
|
||||||
: `${fileCount} file${fileCount !== 1 ? 's' : ''}`}
|
)}
|
||||||
</Text>
|
</Box>
|
||||||
)}
|
<Box shrink="No">
|
||||||
</Box>
|
<IconButton size="300" radii="300" onClick={onDismiss}>
|
||||||
<Box shrink="No">
|
<Icon src={Icons.Cross} />
|
||||||
<IconButton size="300" radii="300" onClick={onDismiss}>
|
</IconButton>
|
||||||
<Icon src={Icons.Cross} />
|
</Box>
|
||||||
</IconButton>
|
</Header>
|
||||||
</Box>
|
|
||||||
</Header>
|
|
||||||
|
|
||||||
<Box
|
<Box
|
||||||
style={{
|
style={{
|
||||||
padding: `0 ${config.space.S300}`,
|
padding: config.space.S200,
|
||||||
paddingTop: config.space.S200,
|
paddingTop: config.space.S300,
|
||||||
paddingBottom: config.space.S200,
|
}}
|
||||||
}}
|
>
|
||||||
>
|
<Input
|
||||||
<Input
|
onChange={handleSearchChange}
|
||||||
onChange={handleSearchChange}
|
before={<Icon size="200" src={Icons.Search} />}
|
||||||
before={<Icon size="200" src={Icons.Search} />}
|
placeholder="Search rooms…"
|
||||||
placeholder="Search rooms…"
|
size="400"
|
||||||
size="400"
|
variant="Background"
|
||||||
variant="Background"
|
outlined
|
||||||
outlined
|
autoFocus
|
||||||
autoFocus
|
style={{ width: '100%' }}
|
||||||
/>
|
/>
|
||||||
</Box>
|
</Box>
|
||||||
|
|
||||||
<Scroll ref={scrollRef} size="300" hideTrack style={{ flex: 1, minHeight: 0 }}>
|
<Scroll ref={scrollRef} size="300" hideTrack style={{ flex: 1, minHeight: 0 }}>
|
||||||
|
<Box style={{ padding: config.space.S300 }} direction="Column">
|
||||||
|
{vItems.length === 0 && (
|
||||||
<Box
|
<Box
|
||||||
style={{ padding: config.space.S300, paddingTop: 0 }}
|
style={{ padding: `${config.space.S700} 0` }}
|
||||||
|
alignItems="Center"
|
||||||
|
justifyContent="Center"
|
||||||
direction="Column"
|
direction="Column"
|
||||||
|
gap="100"
|
||||||
>
|
>
|
||||||
{vItems.length === 0 && (
|
<Text size="H6" align="Center">
|
||||||
<Box
|
{searchResult ? 'No Match Found' : 'No Rooms'}
|
||||||
style={{ padding: `${config.space.S700} 0` }}
|
</Text>
|
||||||
alignItems="Center"
|
<Text size="T200" align="Center" priority="300">
|
||||||
justifyContent="Center"
|
{searchResult
|
||||||
direction="Column"
|
? `No rooms found for "${searchResult.query}".`
|
||||||
gap="100"
|
: 'You have no rooms to share into.'}
|
||||||
|
</Text>
|
||||||
|
</Box>
|
||||||
|
)}
|
||||||
|
<Box style={{ position: 'relative', height: virtualizer.getTotalSize() }}>
|
||||||
|
{vItems.map((vItem) => {
|
||||||
|
const roomId = items[vItem.index];
|
||||||
|
const room = getRoom(roomId);
|
||||||
|
if (!room) return null;
|
||||||
|
const isDm = mDirects.has(roomId);
|
||||||
|
|
||||||
|
const avatarSrc = isDm
|
||||||
|
? getDirectRoomAvatarUrl(mx, room, 96, useAuthentication)
|
||||||
|
: getRoomAvatarUrl(mx, room, 96, useAuthentication);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<VirtualTile
|
||||||
|
virtualItem={vItem}
|
||||||
|
style={{ paddingBottom: config.space.S100 }}
|
||||||
|
ref={virtualizer.measureElement}
|
||||||
|
key={roomId}
|
||||||
>
|
>
|
||||||
<Text size="H6" align="Center">
|
<MenuItem
|
||||||
{searchResult ? 'No Match Found' : 'No Rooms'}
|
data-room-id={roomId}
|
||||||
</Text>
|
onClick={handleRoomClick}
|
||||||
<Text size="T200" align="Center" priority="300">
|
variant="Surface"
|
||||||
{searchResult
|
size="400"
|
||||||
? `No rooms found for "${searchResult.query}".`
|
radii="400"
|
||||||
: 'You have no rooms to share into.'}
|
before={
|
||||||
</Text>
|
<Avatar size="300" radii={isDm ? '400' : '300'}>
|
||||||
</Box>
|
{avatarSrc ? (
|
||||||
)}
|
<RoomAvatar
|
||||||
<Box
|
roomId={roomId}
|
||||||
style={{ position: 'relative', height: virtualizer.getTotalSize() }}
|
src={avatarSrc}
|
||||||
>
|
alt={room.name}
|
||||||
{vItems.map((vItem) => {
|
renderFallback={() => (
|
||||||
const roomId = items[vItem.index];
|
<Text as="span" size="H6">
|
||||||
const room = getRoom(roomId);
|
{nameInitials(room.name)}
|
||||||
if (!room) return null;
|
</Text>
|
||||||
const isDm = mDirects.has(roomId);
|
|
||||||
|
|
||||||
const avatarSrc = isDm
|
|
||||||
? getDirectRoomAvatarUrl(mx, room, 96, useAuthentication)
|
|
||||||
: getRoomAvatarUrl(mx, room, 96, useAuthentication);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<VirtualTile
|
|
||||||
virtualItem={vItem}
|
|
||||||
style={{ paddingBottom: config.space.S100 }}
|
|
||||||
ref={virtualizer.measureElement}
|
|
||||||
key={roomId}
|
|
||||||
>
|
|
||||||
<MenuItem
|
|
||||||
data-room-id={roomId}
|
|
||||||
onClick={handleRoomClick}
|
|
||||||
variant="Surface"
|
|
||||||
size="400"
|
|
||||||
radii="400"
|
|
||||||
before={
|
|
||||||
<Avatar size="300" radii={isDm ? '400' : '300'}>
|
|
||||||
{avatarSrc ? (
|
|
||||||
<RoomAvatar
|
|
||||||
roomId={roomId}
|
|
||||||
src={avatarSrc}
|
|
||||||
alt={room.name}
|
|
||||||
renderFallback={() => (
|
|
||||||
<Text as="span" size="H6">
|
|
||||||
{nameInitials(room.name)}
|
|
||||||
</Text>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<RoomIcon room={room} size="200" filled />
|
|
||||||
)}
|
)}
|
||||||
</Avatar>
|
/>
|
||||||
}
|
) : (
|
||||||
>
|
<RoomIcon room={room} size="200" filled />
|
||||||
<Box grow="Yes" direction="Column">
|
)}
|
||||||
<Text size="B400" truncate>
|
</Avatar>
|
||||||
{room.name}
|
}
|
||||||
</Text>
|
>
|
||||||
</Box>
|
<Box grow="Yes" direction="Column">
|
||||||
</MenuItem>
|
<Text size="B400" truncate>
|
||||||
</VirtualTile>
|
{room.name}
|
||||||
);
|
</Text>
|
||||||
})}
|
</Box>
|
||||||
|
</MenuItem>
|
||||||
|
</VirtualTile>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</Box>
|
||||||
|
</Box>
|
||||||
|
</Scroll>
|
||||||
|
</Box>
|
||||||
|
</FocusTrap>
|
||||||
|
</Overlay>
|
||||||
|
|
||||||
|
{confirmRoomId && (() => {
|
||||||
|
const room = getRoom(confirmRoomId);
|
||||||
|
const roomName = room?.name ?? confirmRoomId;
|
||||||
|
const isDm = mDirects.has(confirmRoomId);
|
||||||
|
return (
|
||||||
|
<Overlay open backdrop={<OverlayBackdrop />}>
|
||||||
|
<OverlayCenter>
|
||||||
|
<FocusTrap
|
||||||
|
focusTrapOptions={{
|
||||||
|
initialFocus: false,
|
||||||
|
onDeactivate: handleCancelConfirm,
|
||||||
|
escapeDeactivates: stopPropagation,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Modal style={{ maxWidth: '280px' }}>
|
||||||
|
<Box direction="Column" gap="100" style={{ padding: config.space.S300 }}>
|
||||||
|
<Box direction="Column" gap="100">
|
||||||
|
<Text size="H4">Share to {isDm ? 'Person' : 'Room'}?</Text>
|
||||||
|
<Text size="T300" priority="300">
|
||||||
|
Send to <strong>{roomName}</strong>?
|
||||||
|
</Text>
|
||||||
|
</Box>
|
||||||
|
<Box gap="200" justifyContent="End">
|
||||||
|
<Button
|
||||||
|
onClick={handleCancelConfirm}
|
||||||
|
variant="Secondary"
|
||||||
|
size="400"
|
||||||
|
>
|
||||||
|
<Text size="B400">Cancel</Text>
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
onClick={handleConfirm}
|
||||||
|
variant="Primary"
|
||||||
|
size="400"
|
||||||
|
>
|
||||||
|
<Text size="B400">Share</Text>
|
||||||
|
</Button>
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
</Scroll>
|
</Modal>
|
||||||
</Box>
|
</FocusTrap>
|
||||||
</Modal>
|
</OverlayCenter>
|
||||||
</FocusTrap>
|
</Overlay>
|
||||||
</OverlayCenter>
|
);
|
||||||
</Overlay>
|
})()}
|
||||||
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
149
overlay/src/app/features/settings/plugins/PluginAPI.ts
Normal file
149
overlay/src/app/features/settings/plugins/PluginAPI.ts
Normal file
@@ -0,0 +1,149 @@
|
|||||||
|
/**
|
||||||
|
* Re-exports the full @paarrot/plugin-manager API and creates the shared
|
||||||
|
* singleton PluginRegistry instance for this application.
|
||||||
|
*
|
||||||
|
* All other modules in this folder should import from here rather than
|
||||||
|
* directly from the package so the singleton is guaranteed to be shared.
|
||||||
|
*/
|
||||||
|
export {
|
||||||
|
PluginMarketplaceClient,
|
||||||
|
PluginMarketplaceManager,
|
||||||
|
PluginRegistry,
|
||||||
|
createPluginContext,
|
||||||
|
generateThemeCSS,
|
||||||
|
MemoryStorage,
|
||||||
|
} from '@paarrot/plugin-manager';
|
||||||
|
|
||||||
|
export type {
|
||||||
|
IPluginStorage,
|
||||||
|
IPluginEventClient,
|
||||||
|
PluginMarketplaceClientOptions,
|
||||||
|
PluginMarketplaceHostAdapter,
|
||||||
|
PluginMarketplaceInstalledRecord,
|
||||||
|
PluginMarketplaceManagerOptions,
|
||||||
|
PluginRegistryOptions,
|
||||||
|
PluginContextOptions,
|
||||||
|
PluginMetadata,
|
||||||
|
InstalledPlugin,
|
||||||
|
PluginIndex,
|
||||||
|
ThemeColorGroup,
|
||||||
|
ThemePaletteGroup,
|
||||||
|
PluginThemeColors,
|
||||||
|
PluginTheme,
|
||||||
|
CommandArg,
|
||||||
|
PluginCommand,
|
||||||
|
MessageInterceptor,
|
||||||
|
MessageContext,
|
||||||
|
CustomRenderer,
|
||||||
|
SettingDefinition,
|
||||||
|
SettingsSchema,
|
||||||
|
NotificationOptions,
|
||||||
|
PluginContext,
|
||||||
|
PluginSettingsSection,
|
||||||
|
UILocation,
|
||||||
|
UIButtonDefinition,
|
||||||
|
UIButtonPosition,
|
||||||
|
Plugin,
|
||||||
|
PluginLogEntry,
|
||||||
|
} from '@paarrot/plugin-manager';
|
||||||
|
|
||||||
|
export { PluginTab } from '@paarrot/plugin-manager';
|
||||||
|
|
||||||
|
import {
|
||||||
|
PluginMarketplaceClient,
|
||||||
|
PluginMarketplaceManager,
|
||||||
|
PluginRegistry,
|
||||||
|
} from '@paarrot/plugin-manager';
|
||||||
|
import { getPluginHost } from '../../../utils/pluginHost';
|
||||||
|
|
||||||
|
const PLUGIN_INDEX_URL =
|
||||||
|
import.meta.env.VITE_PLUGIN_INDEX_URL ||
|
||||||
|
`https://raw.githubusercontent.com/Paarrot/Plugin-Directory/refs/heads/main/plugins/index.json?cache_burst=${(Math.random()*256).toString()}`;
|
||||||
|
const PLUGIN_BASE_URL =
|
||||||
|
import.meta.env.VITE_PLUGIN_BASE_URL ||
|
||||||
|
'https://raw.githubusercontent.com/Paarrot/Plugin-Directory/refs/heads/main/plugins/';
|
||||||
|
|
||||||
|
function injectThemeStyle(styleId: string, css: string): void {
|
||||||
|
let el = document.getElementById(styleId) as HTMLStyleElement | null;
|
||||||
|
if (!el) {
|
||||||
|
el = document.createElement('style');
|
||||||
|
el.id = styleId;
|
||||||
|
document.head.appendChild(el);
|
||||||
|
}
|
||||||
|
el.textContent = css;
|
||||||
|
}
|
||||||
|
|
||||||
|
function removeThemeStyle(styleId: string): void {
|
||||||
|
document.getElementById(styleId)?.remove();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Shared singleton registry for the entire application. */
|
||||||
|
export const pluginRegistry = new PluginRegistry({
|
||||||
|
storage: localStorage,
|
||||||
|
onThemeRegistered: (themeId, _className, css) =>
|
||||||
|
injectThemeStyle(`plugin-theme-${themeId}`, css),
|
||||||
|
onThemeUnregistered: (themeId) => removeThemeStyle(`plugin-theme-${themeId}`),
|
||||||
|
});
|
||||||
|
|
||||||
|
/** Shared marketplace client for remote plugin directory reads. */
|
||||||
|
export const pluginMarketplaceClient = new PluginMarketplaceClient({
|
||||||
|
indexUrl: PLUGIN_INDEX_URL,
|
||||||
|
baseUrl: PLUGIN_BASE_URL,
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Shared marketplace manager for install state, directory fetch, and enable flags.
|
||||||
|
*/
|
||||||
|
export const pluginMarketplaceManager = new PluginMarketplaceManager({
|
||||||
|
client: pluginMarketplaceClient,
|
||||||
|
storage: localStorage,
|
||||||
|
registry: pluginRegistry,
|
||||||
|
host: {
|
||||||
|
listInstalledPlugins: async () => {
|
||||||
|
const host = getPluginHost();
|
||||||
|
if (!host) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = await host.list();
|
||||||
|
if (!result.success || !result.data) {
|
||||||
|
throw new Error(result.error ?? 'Failed to list installed plugins');
|
||||||
|
}
|
||||||
|
|
||||||
|
return result.data.map((plugin) => ({
|
||||||
|
id: plugin.id,
|
||||||
|
name: plugin.name,
|
||||||
|
version: plugin.version,
|
||||||
|
description: plugin.description,
|
||||||
|
author: plugin.author,
|
||||||
|
repository: plugin.repository,
|
||||||
|
thumbnail: plugin.thumbnail,
|
||||||
|
homepage: plugin.homepage,
|
||||||
|
tags: plugin.tags,
|
||||||
|
installedDate: plugin.installedDate,
|
||||||
|
}));
|
||||||
|
},
|
||||||
|
installPlugin: async (plugin) => {
|
||||||
|
const host = getPluginHost();
|
||||||
|
if (!host) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = await host.download(plugin.id, plugin.downloadUrl, plugin.name);
|
||||||
|
if (!result.success) {
|
||||||
|
throw new Error(result.error ?? 'Failed to install plugin');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
uninstallPlugin: async (pluginId) => {
|
||||||
|
const host = getPluginHost();
|
||||||
|
if (!host) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = await host.uninstall(pluginId);
|
||||||
|
if (!result.success) {
|
||||||
|
throw new Error(result.error ?? 'Failed to uninstall plugin');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
190
overlay/src/app/features/settings/plugins/PluginLoader.tsx
Normal file
190
overlay/src/app/features/settings/plugins/PluginLoader.tsx
Normal file
@@ -0,0 +1,190 @@
|
|||||||
|
import React, { useEffect } from 'react';
|
||||||
|
import { MatrixClient } from 'matrix-js-sdk';
|
||||||
|
import { Plugin, createPluginContext } from '@paarrot/plugin-manager';
|
||||||
|
import { pluginMarketplaceManager, pluginRegistry } from './PluginAPI';
|
||||||
|
import { sendNotification } from '../../../utils/tauri';
|
||||||
|
import { getPluginHost } from '../../../utils/pluginHost';
|
||||||
|
import { dispatchPluginButtonsChanged } from './PluginButtonSlot';
|
||||||
|
|
||||||
|
interface PluginLoaderProps {
|
||||||
|
matrixClient: MatrixClient;
|
||||||
|
children: React.ReactNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Component that loads and initializes enabled plugins.
|
||||||
|
* Should be placed high in the component tree after MatrixClient is available.
|
||||||
|
*/
|
||||||
|
export function PluginLoader({ matrixClient, children }: PluginLoaderProps) {
|
||||||
|
console.log('[PluginLoader] Component rendering, matrixClient:', !!matrixClient);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const loadPlugins = async () => {
|
||||||
|
try {
|
||||||
|
const pluginHost = getPluginHost();
|
||||||
|
console.log('[PluginLoader] Loading plugins...');
|
||||||
|
console.log('[PluginLoader] plugin host available:', !!pluginHost);
|
||||||
|
|
||||||
|
if (!pluginHost) {
|
||||||
|
console.log('[PluginLoader] Running in web mode, plugins not supported');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const pluginsToLoad = await pluginMarketplaceManager.listEnabledPlugins();
|
||||||
|
|
||||||
|
console.log('[PluginLoader] Plugins to load:', pluginsToLoad.length);
|
||||||
|
console.log('[PluginLoader] Plugin list:', pluginsToLoad.map((p) => p.id));
|
||||||
|
|
||||||
|
for (const installedPlugin of pluginsToLoad) {
|
||||||
|
try {
|
||||||
|
console.log(`[PluginLoader] Loading plugin: ${installedPlugin.id}`);
|
||||||
|
|
||||||
|
const pluginModule = await loadPluginModule(installedPlugin.id);
|
||||||
|
const plugin = normalisePlugin(pluginModule);
|
||||||
|
|
||||||
|
if (!plugin || typeof plugin !== 'object') {
|
||||||
|
console.error(
|
||||||
|
`[PluginLoader] Plugin ${installedPlugin.id} does not export a valid plugin object`
|
||||||
|
);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (typeof plugin.onLoad !== 'function') {
|
||||||
|
console.error(
|
||||||
|
`[PluginLoader] Plugin ${installedPlugin.id} does not have an onLoad function`
|
||||||
|
);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
const context = createPluginContext(
|
||||||
|
{
|
||||||
|
pluginId: installedPlugin.id,
|
||||||
|
eventClient: matrixClient as any,
|
||||||
|
onNotify: async (opts) => {
|
||||||
|
await sendNotification({
|
||||||
|
title: opts.title,
|
||||||
|
body: opts.body,
|
||||||
|
path: undefined,
|
||||||
|
});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
pluginRegistry
|
||||||
|
);
|
||||||
|
|
||||||
|
const compatContext = Object.assign(context as Record<string, unknown>, {
|
||||||
|
matrixClient,
|
||||||
|
matrix: {
|
||||||
|
on: (eventType: string, handler: (...args: unknown[]) => void) =>
|
||||||
|
matrixClient.on(eventType as any, handler as any),
|
||||||
|
off: (eventType: string, handler: (...args: unknown[]) => void) =>
|
||||||
|
matrixClient.off(eventType as any, handler as any),
|
||||||
|
},
|
||||||
|
React,
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log('[PluginLoader] compatContext.React:', !!compatContext.React);
|
||||||
|
console.log('[PluginLoader] compatContext.ui:', !!compatContext.ui);
|
||||||
|
console.log('[PluginLoader] About to register plugin and call onLoad...');
|
||||||
|
|
||||||
|
pluginRegistry.registerPlugin(installedPlugin.id, plugin, context);
|
||||||
|
await plugin.onLoad(compatContext as any);
|
||||||
|
console.log(`[PluginLoader] Successfully loaded plugin: ${installedPlugin.id}`);
|
||||||
|
dispatchPluginButtonsChanged();
|
||||||
|
} catch (error) {
|
||||||
|
console.error(`[PluginLoader] Failed to load plugin ${installedPlugin.id}:`, error);
|
||||||
|
pluginRegistry.addLog(installedPlugin.id, 'error', ['Failed to load:', error]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('[PluginLoader] Error loading plugins:', error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
loadPlugins();
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
console.log('[PluginLoader] Cleaning up plugins');
|
||||||
|
pluginRegistry.clear();
|
||||||
|
dispatchPluginButtonsChanged();
|
||||||
|
};
|
||||||
|
}, [matrixClient]);
|
||||||
|
|
||||||
|
return <>{children}</>;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reads and evaluates a plugin's JS module from the native filesystem host.
|
||||||
|
* Supports both CommonJS and ESM-style exports.
|
||||||
|
*/
|
||||||
|
async function loadPluginModule(pluginId: string): Promise<any> {
|
||||||
|
const pluginHost = getPluginHost();
|
||||||
|
if (!pluginHost) {
|
||||||
|
throw new Error('Plugins are only supported in the desktop or Android app');
|
||||||
|
}
|
||||||
|
|
||||||
|
const response = await pluginHost.readPluginCode(pluginId);
|
||||||
|
if (!response.success || !response.data) {
|
||||||
|
throw new Error(response.error ?? 'Failed to read plugin code');
|
||||||
|
}
|
||||||
|
|
||||||
|
const pluginExports: any = {};
|
||||||
|
const mod = { exports: pluginExports };
|
||||||
|
|
||||||
|
try {
|
||||||
|
// eslint-disable-next-line no-new-func
|
||||||
|
const pluginFunction = new Function('module', 'exports', response.data);
|
||||||
|
pluginFunction(mod, pluginExports);
|
||||||
|
} catch (error) {
|
||||||
|
if (!(error instanceof SyntaxError)) {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
|
||||||
|
const dataUrl = `data:text/javascript;charset=utf-8,${encodeURIComponent(response.data)}`;
|
||||||
|
const importedModule = await import(/* @vite-ignore */ dataUrl);
|
||||||
|
return importedModule;
|
||||||
|
}
|
||||||
|
|
||||||
|
return mod.exports;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Normalizes raw plugin exports to current plugin interface.
|
||||||
|
* Supports native `onLoad` and legacy `activate` / `deactivate` plugins.
|
||||||
|
*/
|
||||||
|
function normalisePlugin(raw: Record<string, unknown>): Plugin {
|
||||||
|
if (typeof raw.onLoad === 'function') {
|
||||||
|
return raw as unknown as Plugin;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (typeof raw.activate === 'function') {
|
||||||
|
const activate = raw.activate as (ctx: unknown) => void | Promise<void>;
|
||||||
|
const deactivate = raw.deactivate as ((ctx?: unknown) => void | Promise<void>) | undefined;
|
||||||
|
|
||||||
|
return {
|
||||||
|
name: typeof raw.name === 'string' ? raw.name : undefined,
|
||||||
|
version: typeof raw.version === 'string' ? raw.version : undefined,
|
||||||
|
onLoad: async (ctx) => {
|
||||||
|
const legacyCtx = Object.assign(Object.create(ctx as object), {
|
||||||
|
registerHook: (name: string) =>
|
||||||
|
ctx.log(`[compat] registerHook("${name}") - not supported`),
|
||||||
|
runHook: (name: string) => {
|
||||||
|
ctx.log(`[compat] runHook("${name}")`);
|
||||||
|
return Promise.resolve([]);
|
||||||
|
},
|
||||||
|
getConfig: (key: string) => ctx.settings.get(key),
|
||||||
|
on: (event: string, handler: (...args: unknown[]) => void) =>
|
||||||
|
ctx.events.on(event, handler),
|
||||||
|
});
|
||||||
|
|
||||||
|
await activate(legacyCtx);
|
||||||
|
},
|
||||||
|
onUnload: deactivate
|
||||||
|
? async () => {
|
||||||
|
await deactivate();
|
||||||
|
}
|
||||||
|
: undefined,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return raw as unknown as Plugin;
|
||||||
|
}
|
||||||
@@ -517,86 +517,118 @@ function TaskbarFlashStopper() {
|
|||||||
|
|
||||||
function AndroidShareIntentHandler() {
|
function AndroidShareIntentHandler() {
|
||||||
const mx = useMatrixClient();
|
const mx = useMatrixClient();
|
||||||
const [isMarkdown] = useSetting(settingsAtom, 'isMarkdown');
|
const navigate = useNavigate();
|
||||||
const [pendingShare, setPendingShare] = useState<AndroidSharePayload | null>(null);
|
const [pendingShare, setPendingShare] = useState<AndroidSharePayload | null>(null);
|
||||||
const [pickedRoomId, setPickedRoomId] = useState<string | null>(null);
|
const mDirects = useAtomValue(mDirectAtom);
|
||||||
const [msgDraft, setMsgDraft] = useAtom(roomIdToMsgDraftAtomFamily(pickedRoomId ?? '__android_share__'));
|
const roomToParents = useAtomValue(roomToParentsAtom);
|
||||||
const setUploadItems = useSetAtom(roomIdToUploadItemsAtomFamily(pickedRoomId ?? '__android_share__'));
|
|
||||||
|
|
||||||
const applyPendingShare = useCallback(
|
const applyPendingShare = useCallback(
|
||||||
async (share: AndroidSharePayload, roomId: string) => {
|
async (share: AndroidSharePayload, roomId: string) => {
|
||||||
const room = mx.getRoom(roomId);
|
const room = mx.getRoom(roomId);
|
||||||
if (!room) return false;
|
if (!room) return false;
|
||||||
|
|
||||||
|
// Send text message if present
|
||||||
const nextParts = [share.subject?.trim(), share.text?.trim()].filter(
|
const nextParts = [share.subject?.trim(), share.text?.trim()].filter(
|
||||||
(value): value is string => !!value
|
(value): value is string => !!value
|
||||||
);
|
);
|
||||||
if (nextParts.length > 0) {
|
if (nextParts.length > 0) {
|
||||||
const existingText = toPlainText(msgDraft, isMarkdown).trim();
|
const textContent = {
|
||||||
const nextText = existingText ? `${existingText}\n${nextParts.join('\n')}` : nextParts.join('\n');
|
msgtype: 'm.text' as const,
|
||||||
setMsgDraft(plainToEditorInput(nextText, isMarkdown));
|
body: nextParts.join('\n'),
|
||||||
|
};
|
||||||
|
await mx.sendMessage(roomId, textContent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Upload and send files if present
|
||||||
if (share.files.length > 0) {
|
if (share.files.length > 0) {
|
||||||
const uploadItems: TUploadItem[] = [];
|
|
||||||
for (const sharedFile of share.files) {
|
for (const sharedFile of share.files) {
|
||||||
const originalFile = await materializeSharedFile(sharedFile, share.receivedAt);
|
const originalFile = await materializeSharedFile(sharedFile, share.receivedAt);
|
||||||
|
|
||||||
|
let fileToUpload = originalFile;
|
||||||
|
let encInfo: any = undefined;
|
||||||
|
|
||||||
if (room.hasEncryptionStateEvent()) {
|
if (room.hasEncryptionStateEvent()) {
|
||||||
const encrypted = await encryptFile(originalFile);
|
const encrypted = await encryptFile(originalFile);
|
||||||
uploadItems.push({
|
fileToUpload = encrypted.file;
|
||||||
file: encrypted.file,
|
encInfo = encrypted.encInfo;
|
||||||
originalFile,
|
|
||||||
metadata: { markedAsSpoiler: false },
|
|
||||||
encInfo: encrypted.encInfo,
|
|
||||||
});
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
uploadItems.push({
|
// Upload file
|
||||||
file: originalFile,
|
const uploadResult = await mx.uploadContent(fileToUpload);
|
||||||
originalFile,
|
const mxc = uploadResult?.content_uri;
|
||||||
metadata: { markedAsSpoiler: false },
|
if (!mxc) continue;
|
||||||
encInfo: undefined,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
setUploadItems({
|
// Determine message type and send
|
||||||
type: 'PUT',
|
const fileType = originalFile.type;
|
||||||
item: uploadItems,
|
let msgtype = 'm.file' as const;
|
||||||
});
|
if (fileType.startsWith('image/')) msgtype = 'm.image' as const;
|
||||||
|
else if (fileType.startsWith('video/')) msgtype = 'm.video' as const;
|
||||||
|
else if (fileType.startsWith('audio/')) msgtype = 'm.audio' as const;
|
||||||
|
|
||||||
|
const fileContent: any = {
|
||||||
|
msgtype,
|
||||||
|
body: originalFile.name,
|
||||||
|
filename: originalFile.name,
|
||||||
|
info: {
|
||||||
|
mimetype: originalFile.type,
|
||||||
|
size: originalFile.size,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
if (encInfo) {
|
||||||
|
fileContent.file = {
|
||||||
|
...encInfo,
|
||||||
|
url: mxc,
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
fileContent.url = mxc;
|
||||||
|
}
|
||||||
|
|
||||||
|
await mx.sendMessage(roomId, fileContent);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
await clearPendingAndroidShare();
|
await clearPendingAndroidShare();
|
||||||
return true;
|
return true;
|
||||||
},
|
},
|
||||||
[isMarkdown, msgDraft, mx, setMsgDraft, setUploadItems]
|
[mx]
|
||||||
);
|
);
|
||||||
|
|
||||||
const handlePickRoom = useCallback(
|
const handlePickRoom = useCallback(
|
||||||
(roomId: string) => {
|
(roomId: string) => {
|
||||||
setPickedRoomId(roomId);
|
|
||||||
if (!pendingShare) return;
|
if (!pendingShare) return;
|
||||||
|
|
||||||
applyPendingShare(pendingShare, roomId)
|
applyPendingShare(pendingShare, roomId)
|
||||||
.then((applied) => {
|
.then((applied) => {
|
||||||
if (applied) {
|
if (applied) {
|
||||||
setPendingShare(null);
|
setPendingShare(null);
|
||||||
setPickedRoomId(null);
|
|
||||||
|
// Navigate to the selected room
|
||||||
|
const isDirect = mDirects.has(roomId);
|
||||||
|
if (isDirect) {
|
||||||
|
navigate(getDirectRoomPath(roomId));
|
||||||
|
} else {
|
||||||
|
const parents = roomToParents.get(roomId);
|
||||||
|
const parent = parents && parents.length > 0 ? parents[0] : undefined;
|
||||||
|
if (parent) {
|
||||||
|
navigate(getSpaceRoomPath(parent, roomId));
|
||||||
|
} else {
|
||||||
|
navigate(getHomeRoomPath(roomId));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
console.error('[AndroidShare] Failed to apply share after pick:', err);
|
console.error('[AndroidShare] Failed to apply share after pick:', err);
|
||||||
setPendingShare(null);
|
setPendingShare(null);
|
||||||
setPickedRoomId(null);
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
[applyPendingShare, pendingShare]
|
[applyPendingShare, pendingShare, navigate, mDirects, roomToParents]
|
||||||
);
|
);
|
||||||
|
|
||||||
const handleDismiss = useCallback(() => {
|
const handleDismiss = useCallback(() => {
|
||||||
clearPendingAndroidShare().catch(() => {});
|
clearPendingAndroidShare().catch(() => {});
|
||||||
setPendingShare(null);
|
setPendingShare(null);
|
||||||
setPickedRoomId(null);
|
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|||||||
72
overlay/src/app/utils/pluginHost.ts
Normal file
72
overlay/src/app/utils/pluginHost.ts
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
import { Capacitor, registerPlugin } from '@capacitor/core';
|
||||||
|
|
||||||
|
export type PluginHostListItem = {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
version?: string;
|
||||||
|
description?: string;
|
||||||
|
author?: string;
|
||||||
|
repository?: string;
|
||||||
|
thumbnail?: string;
|
||||||
|
homepage?: string;
|
||||||
|
tags?: string[];
|
||||||
|
installedDate: string;
|
||||||
|
path: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type PluginHostResult<T> = {
|
||||||
|
success: boolean;
|
||||||
|
data?: T;
|
||||||
|
error?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export interface PluginHostAPI {
|
||||||
|
getPath: () => Promise<PluginHostResult<string>>;
|
||||||
|
download: (
|
||||||
|
pluginId: string,
|
||||||
|
downloadUrl: string,
|
||||||
|
name: string
|
||||||
|
) => Promise<PluginHostResult<{ path: string }>>;
|
||||||
|
list: () => Promise<PluginHostResult<PluginHostListItem[]>>;
|
||||||
|
uninstall: (pluginId: string) => Promise<PluginHostResult<void>>;
|
||||||
|
readPluginCode: (pluginId: string) => Promise<PluginHostResult<string>>;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface PluginStoragePlugin {
|
||||||
|
getPath(): Promise<PluginHostResult<string>>;
|
||||||
|
download(options: {
|
||||||
|
pluginId: string;
|
||||||
|
downloadUrl: string;
|
||||||
|
name: string;
|
||||||
|
}): Promise<PluginHostResult<{ path: string }>>;
|
||||||
|
list(): Promise<PluginHostResult<PluginHostListItem[]>>;
|
||||||
|
uninstall(options: { pluginId: string }): Promise<PluginHostResult<void>>;
|
||||||
|
readPluginCode(options: { pluginId: string }): Promise<PluginHostResult<string>>;
|
||||||
|
}
|
||||||
|
|
||||||
|
const PluginStorage = registerPlugin<PluginStoragePlugin>('PluginStorage');
|
||||||
|
|
||||||
|
const androidPluginHost: PluginHostAPI = {
|
||||||
|
getPath: () => PluginStorage.getPath(),
|
||||||
|
download: (pluginId, downloadUrl, name) =>
|
||||||
|
PluginStorage.download({ pluginId, downloadUrl, name }),
|
||||||
|
list: () => PluginStorage.list(),
|
||||||
|
uninstall: (pluginId) => PluginStorage.uninstall({ pluginId }),
|
||||||
|
readPluginCode: (pluginId) => PluginStorage.readPluginCode({ pluginId }),
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Returns true when a native plugin filesystem host is available. */
|
||||||
|
export const isPluginHostSupported = (): boolean => getPluginHost() !== null;
|
||||||
|
|
||||||
|
/** Returns the active plugin host for Electron or Android. */
|
||||||
|
export const getPluginHost = (): PluginHostAPI | null => {
|
||||||
|
if (window.electron?.plugins) {
|
||||||
|
return window.electron.plugins;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Capacitor.isNativePlatform() && Capacitor.getPlatform() === 'android') {
|
||||||
|
return androidPluginHost;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
};
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "paarrot",
|
"name": "paarrot",
|
||||||
"version": "4.11.100",
|
"version": "4.11.110",
|
||||||
"description": "Paarrot - A Matrix client based on Cinny",
|
"description": "Paarrot - A Matrix client based on Cinny",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=18.0.0"
|
"node": ">=18.0.0"
|
||||||
|
|||||||
Reference in New Issue
Block a user