Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0696f5663e | |||
| 4a531df8bd | |||
| 365f44dbe4 | |||
| 40c2ce20f3 | |||
| aa516667cd |
@@ -7,8 +7,11 @@ on:
|
||||
|
||||
jobs:
|
||||
build:
|
||||
if: github.server_url == 'https://github.com'
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 60
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
@@ -4,6 +4,7 @@ import DateTimePicker from "@react-native-community/datetimepicker";
|
||||
import AsyncStorage from "@react-native-async-storage/async-storage";
|
||||
import * as Haptics from "expo-haptics";
|
||||
import { Image } from "expo-image";
|
||||
import * as ImageManipulator from "expo-image-manipulator";
|
||||
import * as ImagePicker from "expo-image-picker";
|
||||
import { fetch as expoFetch } from "expo/fetch";
|
||||
import { useLocalSearchParams } from "expo-router";
|
||||
@@ -23,9 +24,12 @@ import {
|
||||
import { KeyboardAwareScrollView } from "react-native-keyboard-controller";
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context";
|
||||
import { ChannelChip } from "@/components/ChannelChip";
|
||||
import { MediaLibraryModal } from "@/components/MediaLibraryModal";
|
||||
import { PostizIntegration, PostizUploadResult, usePostiz } from "@/context/PostizContext";
|
||||
import { useColors } from "@/hooks/useColors";
|
||||
|
||||
const DRAFT_STORAGE_KEY = "postiz_local_draft";
|
||||
const MAX_IMAGES = 4;
|
||||
|
||||
const NETWORK_CHAR_LIMITS: Record<string, number> = {
|
||||
twitter: 280, x: 280,
|
||||
@@ -36,6 +40,16 @@ const NETWORK_CHAR_LIMITS: Record<string, number> = {
|
||||
tiktok: 2200,
|
||||
};
|
||||
|
||||
type MediaItem =
|
||||
| { type: "local"; uri: string }
|
||||
| { type: "uploaded"; id: string; path: string };
|
||||
|
||||
function resolveMediaUrl(path: string, baseUrl: string): string {
|
||||
if (path.startsWith("http://") || path.startsWith("https://")) return path;
|
||||
const origin = baseUrl.replace(/\/api\/.*$/, "");
|
||||
return `${origin}/${path.replace(/^\//, "")}`;
|
||||
}
|
||||
|
||||
export default function ComposeScreen() {
|
||||
const colors = useColors();
|
||||
const insets = useSafeAreaInsets();
|
||||
@@ -48,6 +62,7 @@ export default function ComposeScreen() {
|
||||
prefillImagePath?: string;
|
||||
prefillImageId?: string;
|
||||
}>();
|
||||
|
||||
const [content, setContent] = useState("");
|
||||
const [selectedChannels, setSelectedChannels] = useState<string[]>([]);
|
||||
const [postNow, setPostNow] = useState(false);
|
||||
@@ -56,22 +71,19 @@ export default function ComposeScreen() {
|
||||
);
|
||||
const [showDatePicker, setShowDatePicker] = useState(false);
|
||||
const [showTimePicker, setShowTimePicker] = useState(false);
|
||||
const [imageUri, setImageUri] = useState<string | null>(null);
|
||||
const [existingMedia, setExistingMedia] = useState<Array<{ id: string; path: string }>>([]);
|
||||
const [mediaItems, setMediaItems] = useState<MediaItem[]>([]);
|
||||
const [showMediaLibrary, setShowMediaLibrary] = useState(false);
|
||||
const [uploading, setUploading] = useState(false);
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
const [draftBanner, setDraftBanner] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
if (prefillContent) {
|
||||
setContent(String(prefillContent));
|
||||
}
|
||||
if (prefillContent) setContent(String(prefillContent));
|
||||
if (prefillIntegrationIds) {
|
||||
setSelectedChannels(String(prefillIntegrationIds).split(",").filter(Boolean));
|
||||
}
|
||||
if (prefillImagePath && prefillImageId) {
|
||||
setExistingMedia([{ id: String(prefillImageId), path: String(prefillImagePath) }]);
|
||||
setImageUri(String(prefillImagePath));
|
||||
setMediaItems([{ type: "uploaded", id: String(prefillImageId), path: String(prefillImagePath) }]);
|
||||
}
|
||||
}, [prefillContent, prefillIntegrationIds, prefillImagePath, prefillImageId]);
|
||||
|
||||
@@ -129,8 +141,6 @@ export default function ComposeScreen() {
|
||||
} catch {}
|
||||
};
|
||||
|
||||
const dismissDraft = () => setDraftBanner(false);
|
||||
|
||||
const toggleChannel = (id: string) => {
|
||||
setSelectedChannels((prev) =>
|
||||
prev.includes(id) ? prev.filter((c) => c !== id) : [...prev, id]
|
||||
@@ -138,38 +148,68 @@ export default function ComposeScreen() {
|
||||
};
|
||||
|
||||
const pickImage = async () => {
|
||||
if (mediaItems.length >= MAX_IMAGES) {
|
||||
Alert.alert("Max images", `You can add up to ${MAX_IMAGES} images per post.`);
|
||||
return;
|
||||
}
|
||||
const { status } = await ImagePicker.requestMediaLibraryPermissionsAsync();
|
||||
if (status !== "granted") {
|
||||
Alert.alert("Permission required", "Allow access to your photo library.");
|
||||
return;
|
||||
}
|
||||
const remaining = MAX_IMAGES - mediaItems.length;
|
||||
const result = await ImagePicker.launchImageLibraryAsync({
|
||||
mediaTypes: ["images"],
|
||||
allowsMultipleSelection: true,
|
||||
selectionLimit: remaining,
|
||||
allowsEditing: false,
|
||||
quality: 0.85,
|
||||
quality: 1,
|
||||
});
|
||||
if (!result.canceled && result.assets[0]) {
|
||||
setImageUri(result.assets[0].uri);
|
||||
setExistingMedia([]);
|
||||
if (!result.canceled && result.assets.length > 0) {
|
||||
const MAX_DIM = 1920;
|
||||
const processed: string[] = [];
|
||||
for (const asset of result.assets) {
|
||||
const w = asset.width ?? 0;
|
||||
const h = asset.height ?? 0;
|
||||
if (w > MAX_DIM || h > MAX_DIM) {
|
||||
const landscape = w >= h;
|
||||
const resized = await ImageManipulator.manipulateAsync(
|
||||
asset.uri,
|
||||
[{ resize: landscape ? { width: MAX_DIM } : { height: MAX_DIM } }],
|
||||
{ compress: 0.85, format: ImageManipulator.SaveFormat.JPEG }
|
||||
);
|
||||
processed.push(resized.uri);
|
||||
} else {
|
||||
processed.push(asset.uri);
|
||||
}
|
||||
}
|
||||
setMediaItems((prev) =>
|
||||
[...prev, ...processed.map((uri): MediaItem => ({ type: "local", uri }))].slice(0, MAX_IMAGES)
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
const removeImage = () => {
|
||||
setImageUri(null);
|
||||
setExistingMedia([]);
|
||||
const removeMediaItem = (index: number) => {
|
||||
setMediaItems((prev) => prev.filter((_, i) => i !== index));
|
||||
};
|
||||
|
||||
const uploadImage = async (): Promise<PostizUploadResult> => {
|
||||
const buildMediaPayload = async (): Promise<Array<{ id: string; path: string }>> => {
|
||||
setUploading(true);
|
||||
try {
|
||||
const result: Array<{ id: string; path: string }> = [];
|
||||
for (const item of mediaItems) {
|
||||
if (item.type === "uploaded") {
|
||||
result.push({ id: item.id, path: item.path });
|
||||
continue;
|
||||
}
|
||||
const formData = new FormData();
|
||||
if (Platform.OS === "web") {
|
||||
const response = await expoFetch(imageUri!);
|
||||
const response = await expoFetch(item.uri);
|
||||
const blob = await response.blob();
|
||||
formData.append("file", blob, "upload.jpg");
|
||||
} else {
|
||||
formData.append("file", {
|
||||
uri: imageUri!,
|
||||
uri: item.uri,
|
||||
name: "upload.jpg",
|
||||
type: "image/jpeg",
|
||||
} as unknown as Blob);
|
||||
@@ -184,7 +224,10 @@ export default function ComposeScreen() {
|
||||
const raw = await uploadRes.text().catch(() => uploadRes.statusText);
|
||||
throw new Error(`Upload HTTP ${uploadRes.status}: ${raw.slice(0, 200)}`);
|
||||
}
|
||||
return await uploadRes.json() as PostizUploadResult;
|
||||
const uploaded = (await uploadRes.json()) as PostizUploadResult;
|
||||
result.push({ id: uploaded.id, path: uploaded.path });
|
||||
}
|
||||
return result;
|
||||
} finally {
|
||||
setUploading(false);
|
||||
}
|
||||
@@ -203,25 +246,16 @@ export default function ComposeScreen() {
|
||||
Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Medium);
|
||||
setSubmitting(true);
|
||||
try {
|
||||
let media: Array<{ id: string; path: string }> = [];
|
||||
const isLocalFile = imageUri && !imageUri.startsWith("http");
|
||||
if (imageUri && isLocalFile) {
|
||||
const uploaded = await uploadImage();
|
||||
media = [{ id: uploaded.id, path: uploaded.path }];
|
||||
} else if (existingMedia.length > 0) {
|
||||
media = existingMedia;
|
||||
}
|
||||
const media = mediaItems.length > 0 ? await buildMediaPayload() : [];
|
||||
const payload = {
|
||||
type: postNow ? "now" : "schedule",
|
||||
date: postNow ? new Date().toISOString() : scheduleDate.toISOString(),
|
||||
shortLink: false,
|
||||
tags: [] as string[],
|
||||
posts: selectedChannels.map((integrationId) => {
|
||||
return {
|
||||
posts: selectedChannels.map((integrationId) => ({
|
||||
integration: { id: integrationId },
|
||||
value: [{ content: content.trim(), image: media }],
|
||||
};
|
||||
}),
|
||||
})),
|
||||
};
|
||||
const body = JSON.stringify(payload);
|
||||
console.log("[compose] POST", `${baseUrl}/posts`, body);
|
||||
@@ -229,10 +263,7 @@ export default function ComposeScreen() {
|
||||
// eslint-disable-next-line no-undef
|
||||
const res = await globalThis.fetch(`${baseUrl}/posts`, {
|
||||
method: "POST",
|
||||
headers: {
|
||||
Authorization: apiKey,
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
headers: { Authorization: apiKey, "Content-Type": "application/json" },
|
||||
body,
|
||||
});
|
||||
|
||||
@@ -240,7 +271,7 @@ export default function ComposeScreen() {
|
||||
let detail = "";
|
||||
try {
|
||||
const raw = await res.text();
|
||||
console.log("[compose] 400 body:", raw);
|
||||
console.log("[compose] error body:", raw);
|
||||
detail = raw.slice(0, 500);
|
||||
} catch {
|
||||
detail = res.statusText;
|
||||
@@ -270,18 +301,13 @@ export default function ComposeScreen() {
|
||||
setContent("");
|
||||
setSelectedChannels([]);
|
||||
setPostNow(false);
|
||||
setImageUri(null);
|
||||
setExistingMedia([]);
|
||||
setMediaItems([]);
|
||||
setDraftBanner(false);
|
||||
setScheduleDate(new Date(Date.now() + 60 * 60 * 1000));
|
||||
};
|
||||
|
||||
const formatDateLabel = (d: Date) =>
|
||||
d.toLocaleDateString("en-US", {
|
||||
month: "short",
|
||||
day: "numeric",
|
||||
year: "numeric",
|
||||
});
|
||||
d.toLocaleDateString("en-US", { month: "short", day: "numeric", year: "numeric" });
|
||||
|
||||
const formatTimeLabel = (d: Date) =>
|
||||
d.toLocaleTimeString("en-US", { hour: "2-digit", minute: "2-digit" });
|
||||
@@ -290,17 +316,14 @@ export default function ComposeScreen() {
|
||||
return (
|
||||
<View style={[styles.centered, { backgroundColor: colors.background }]}>
|
||||
<Feather name="lock" size={32} color={colors.mutedForeground} />
|
||||
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
||||
Not Configured
|
||||
</Text>
|
||||
<Text style={[styles.hint, { color: colors.mutedForeground }]}>
|
||||
Add your API key in Settings
|
||||
</Text>
|
||||
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>Not Configured</Text>
|
||||
<Text style={[styles.hint, { color: colors.mutedForeground }]}>Add your API key in Settings</Text>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<KeyboardAwareScrollView
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={[
|
||||
@@ -317,24 +340,17 @@ export default function ComposeScreen() {
|
||||
{draftBanner && (
|
||||
<View style={[styles.draftBanner, { backgroundColor: colors.card, borderColor: colors.border }]}>
|
||||
<Feather name="file-text" size={14} color={colors.primary} />
|
||||
<Text style={[styles.draftBannerText, { color: colors.foreground }]}>
|
||||
You have a saved draft
|
||||
</Text>
|
||||
<Text style={[styles.draftBannerText, { color: colors.foreground }]}>You have a saved draft</Text>
|
||||
<TouchableOpacity onPress={restoreDraft} activeOpacity={0.7}>
|
||||
<Text style={[styles.draftBannerAction, { color: colors.primary }]}>Restore</Text>
|
||||
</TouchableOpacity>
|
||||
<TouchableOpacity onPress={dismissDraft} activeOpacity={0.7}>
|
||||
<TouchableOpacity onPress={() => setDraftBanner(false)} activeOpacity={0.7}>
|
||||
<Feather name="x" size={14} color={colors.mutedForeground} />
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
)}
|
||||
|
||||
<View
|
||||
style={[
|
||||
styles.textArea,
|
||||
{ backgroundColor: colors.card, borderColor: colors.border },
|
||||
]}
|
||||
>
|
||||
<View style={[styles.textArea, { backgroundColor: colors.card, borderColor: colors.border }]}>
|
||||
<TextInput
|
||||
style={[styles.textInput, { color: colors.foreground }]}
|
||||
placeholder="What do you want to post?"
|
||||
@@ -369,39 +385,65 @@ export default function ComposeScreen() {
|
||||
</View>
|
||||
</View>
|
||||
|
||||
{imageUri && (
|
||||
<View style={styles.imagePreviewWrap}>
|
||||
{mediaItems.length > 0 && (
|
||||
<ScrollView
|
||||
horizontal
|
||||
showsHorizontalScrollIndicator={false}
|
||||
contentContainerStyle={styles.imageRow}
|
||||
>
|
||||
{mediaItems.map((item, idx) => {
|
||||
const uri =
|
||||
item.type === "local"
|
||||
? item.uri
|
||||
: resolveMediaUrl(item.path, baseUrl);
|
||||
return (
|
||||
<View key={idx} style={styles.imageThumbWrap}>
|
||||
<Image
|
||||
source={{ uri: imageUri }}
|
||||
style={[styles.imagePreview, { borderColor: colors.border }]}
|
||||
source={{ uri }}
|
||||
style={[styles.imageThumb, { borderColor: colors.border }]}
|
||||
contentFit="cover"
|
||||
/>
|
||||
<TouchableOpacity
|
||||
onPress={removeImage}
|
||||
onPress={() => removeMediaItem(idx)}
|
||||
style={[styles.removeImg, { backgroundColor: colors.destructive }]}
|
||||
>
|
||||
<Feather name="x" size={12} color="#fff" />
|
||||
</TouchableOpacity>
|
||||
{item.type === "uploaded" && (
|
||||
<View style={[styles.uploadedBadge, { backgroundColor: colors.success }]}>
|
||||
<Feather name="cloud" size={8} color="#fff" />
|
||||
</View>
|
||||
)}
|
||||
</View>
|
||||
);
|
||||
})}
|
||||
</ScrollView>
|
||||
)}
|
||||
|
||||
{mediaItems.length < MAX_IMAGES && (
|
||||
<View style={styles.mediaBtnsRow}>
|
||||
<TouchableOpacity
|
||||
onPress={pickImage}
|
||||
activeOpacity={0.7}
|
||||
style={[
|
||||
styles.mediaBtn,
|
||||
{ backgroundColor: colors.card, borderColor: colors.border },
|
||||
]}
|
||||
style={[styles.mediaBtn, { backgroundColor: colors.card, borderColor: colors.border }]}
|
||||
>
|
||||
<Feather name="image" size={16} color={colors.mutedForeground} />
|
||||
<Text style={[styles.mediaBtnText, { color: colors.mutedForeground }]}>
|
||||
{imageUri ? "Change image" : "Add image"}
|
||||
{mediaItems.length === 0 ? "Add image" : "Add more"}
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
<TouchableOpacity
|
||||
onPress={() => setShowMediaLibrary(true)}
|
||||
activeOpacity={0.7}
|
||||
style={[styles.mediaBtn, { backgroundColor: colors.card, borderColor: colors.border }]}
|
||||
>
|
||||
<Feather name="folder" size={16} color={colors.mutedForeground} />
|
||||
<Text style={[styles.mediaBtnText, { color: colors.mutedForeground }]}>Library</Text>
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
)}
|
||||
|
||||
<Text style={[styles.sectionLabel, { color: colors.mutedForeground }]}>
|
||||
CHANNELS
|
||||
</Text>
|
||||
<Text style={[styles.sectionLabel, { color: colors.mutedForeground }]}>CHANNELS</Text>
|
||||
|
||||
{loadingIntegrations ? (
|
||||
<ActivityIndicator color={colors.primary} style={{ marginVertical: 8 }} />
|
||||
@@ -426,17 +468,10 @@ export default function ComposeScreen() {
|
||||
</ScrollView>
|
||||
)}
|
||||
|
||||
<View
|
||||
style={[
|
||||
styles.scheduleRow,
|
||||
{ backgroundColor: colors.card, borderColor: colors.border },
|
||||
]}
|
||||
>
|
||||
<View style={[styles.scheduleRow, { backgroundColor: colors.card, borderColor: colors.border }]}>
|
||||
<View style={styles.scheduleRowLeft}>
|
||||
<Feather name="zap" size={16} color={colors.primary} />
|
||||
<Text style={[styles.scheduleLabel, { color: colors.foreground }]}>
|
||||
Post now
|
||||
</Text>
|
||||
<Text style={[styles.scheduleLabel, { color: colors.foreground }]}>Post now</Text>
|
||||
</View>
|
||||
<Switch
|
||||
value={postNow}
|
||||
@@ -449,14 +484,8 @@ export default function ComposeScreen() {
|
||||
{!postNow && (
|
||||
<View style={styles.dateTimeRow}>
|
||||
<TouchableOpacity
|
||||
onPress={() => {
|
||||
setShowTimePicker(false);
|
||||
setShowDatePicker((v) => !v);
|
||||
}}
|
||||
style={[
|
||||
styles.dateBtn,
|
||||
{ backgroundColor: colors.card, borderColor: colors.border },
|
||||
]}
|
||||
onPress={() => { setShowTimePicker(false); setShowDatePicker((v) => !v); }}
|
||||
style={[styles.dateBtn, { backgroundColor: colors.card, borderColor: colors.border }]}
|
||||
activeOpacity={0.7}
|
||||
>
|
||||
<Feather name="calendar" size={14} color={colors.primary} />
|
||||
@@ -465,14 +494,8 @@ export default function ComposeScreen() {
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
<TouchableOpacity
|
||||
onPress={() => {
|
||||
setShowDatePicker(false);
|
||||
setShowTimePicker((v) => !v);
|
||||
}}
|
||||
style={[
|
||||
styles.dateBtn,
|
||||
{ backgroundColor: colors.card, borderColor: colors.border },
|
||||
]}
|
||||
onPress={() => { setShowDatePicker(false); setShowTimePicker((v) => !v); }}
|
||||
style={[styles.dateBtn, { backgroundColor: colors.card, borderColor: colors.border }]}
|
||||
activeOpacity={0.7}
|
||||
>
|
||||
<Feather name="clock" size={14} color={colors.primary} />
|
||||
@@ -536,21 +559,14 @@ export default function ComposeScreen() {
|
||||
disabled={submitting || uploading}
|
||||
style={[
|
||||
styles.submitBtn,
|
||||
{
|
||||
backgroundColor:
|
||||
submitting || uploading ? colors.muted : colors.primary,
|
||||
},
|
||||
{ backgroundColor: submitting || uploading ? colors.muted : colors.primary },
|
||||
]}
|
||||
>
|
||||
{submitting || uploading ? (
|
||||
<ActivityIndicator color={colors.primaryForeground} size="small" />
|
||||
) : (
|
||||
<>
|
||||
<Feather
|
||||
name={postNow ? "send" : "clock"}
|
||||
size={16}
|
||||
color={colors.primaryForeground}
|
||||
/>
|
||||
<Feather name={postNow ? "send" : "clock"} size={16} color={colors.primaryForeground} />
|
||||
<Text style={[styles.submitText, { color: colors.primaryForeground }]}>
|
||||
{postNow ? "Publish Now" : "Schedule Post"}
|
||||
</Text>
|
||||
@@ -558,179 +574,55 @@ export default function ComposeScreen() {
|
||||
)}
|
||||
</TouchableOpacity>
|
||||
</KeyboardAwareScrollView>
|
||||
|
||||
<MediaLibraryModal
|
||||
visible={showMediaLibrary}
|
||||
baseUrl={baseUrl}
|
||||
apiKey={apiKey}
|
||||
maxSelect={MAX_IMAGES - mediaItems.length}
|
||||
onClose={() => setShowMediaLibrary(false)}
|
||||
onSelect={(items) => {
|
||||
setMediaItems((prev) =>
|
||||
[...prev, ...items.map((i): MediaItem => ({ type: "uploaded", id: i.id, path: i.path }))].slice(0, MAX_IMAGES)
|
||||
);
|
||||
setShowMediaLibrary(false);
|
||||
}}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
container: {
|
||||
paddingHorizontal: 16,
|
||||
gap: 14,
|
||||
},
|
||||
centered: {
|
||||
flex: 1,
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
gap: 10,
|
||||
},
|
||||
textArea: {
|
||||
borderRadius: 14,
|
||||
borderWidth: 1,
|
||||
padding: 14,
|
||||
minHeight: 140,
|
||||
},
|
||||
textInput: {
|
||||
fontSize: 15,
|
||||
fontFamily: "Inter_400Regular",
|
||||
lineHeight: 22,
|
||||
minHeight: 100,
|
||||
},
|
||||
charCountRow: {
|
||||
flexDirection: "row",
|
||||
justifyContent: "flex-end",
|
||||
alignItems: "center",
|
||||
gap: 6,
|
||||
marginTop: 4,
|
||||
},
|
||||
charCountLabel: {
|
||||
fontSize: 10,
|
||||
fontFamily: "Inter_400Regular",
|
||||
},
|
||||
charCount: {
|
||||
fontSize: 11,
|
||||
fontFamily: "Inter_400Regular",
|
||||
},
|
||||
draftBanner: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: 8,
|
||||
paddingHorizontal: 14,
|
||||
paddingVertical: 10,
|
||||
borderRadius: 12,
|
||||
borderWidth: 1,
|
||||
},
|
||||
draftBannerText: {
|
||||
flex: 1,
|
||||
fontSize: 13,
|
||||
fontFamily: "Inter_400Regular",
|
||||
},
|
||||
draftBannerAction: {
|
||||
fontSize: 13,
|
||||
fontFamily: "Inter_600SemiBold",
|
||||
},
|
||||
draftBtn: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
gap: 6,
|
||||
paddingVertical: 10,
|
||||
borderRadius: 12,
|
||||
borderWidth: 1,
|
||||
},
|
||||
draftBtnText: {
|
||||
fontSize: 13,
|
||||
fontFamily: "Inter_500Medium",
|
||||
},
|
||||
imagePreviewWrap: {
|
||||
position: "relative",
|
||||
alignSelf: "flex-start",
|
||||
},
|
||||
imagePreview: {
|
||||
width: 120,
|
||||
height: 120,
|
||||
borderRadius: 10,
|
||||
borderWidth: 1,
|
||||
},
|
||||
removeImg: {
|
||||
position: "absolute",
|
||||
top: 4,
|
||||
right: 4,
|
||||
width: 20,
|
||||
height: 20,
|
||||
borderRadius: 10,
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
},
|
||||
mediaBtn: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: 8,
|
||||
paddingHorizontal: 14,
|
||||
paddingVertical: 10,
|
||||
borderRadius: 10,
|
||||
borderWidth: 1,
|
||||
alignSelf: "flex-start",
|
||||
},
|
||||
mediaBtnText: {
|
||||
fontSize: 13,
|
||||
fontFamily: "Inter_500Medium",
|
||||
},
|
||||
sectionLabel: {
|
||||
fontSize: 11,
|
||||
fontFamily: "Inter_600SemiBold",
|
||||
letterSpacing: 0.8,
|
||||
marginBottom: -6,
|
||||
},
|
||||
sectionTitle: {
|
||||
fontSize: 18,
|
||||
fontFamily: "Inter_600SemiBold",
|
||||
},
|
||||
hint: {
|
||||
fontSize: 13,
|
||||
fontFamily: "Inter_400Regular",
|
||||
textAlign: "center",
|
||||
},
|
||||
channelList: {
|
||||
flexDirection: "row",
|
||||
gap: 8,
|
||||
flexWrap: "wrap",
|
||||
},
|
||||
scheduleRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "space-between",
|
||||
paddingHorizontal: 16,
|
||||
paddingVertical: 12,
|
||||
borderRadius: 12,
|
||||
borderWidth: 1,
|
||||
},
|
||||
scheduleRowLeft: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: 10,
|
||||
},
|
||||
scheduleLabel: {
|
||||
fontSize: 15,
|
||||
fontFamily: "Inter_500Medium",
|
||||
},
|
||||
dateTimeRow: {
|
||||
flexDirection: "row",
|
||||
gap: 10,
|
||||
},
|
||||
dateBtn: {
|
||||
flex: 1,
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: 8,
|
||||
paddingHorizontal: 12,
|
||||
paddingVertical: 10,
|
||||
borderRadius: 10,
|
||||
borderWidth: 1,
|
||||
},
|
||||
dateBtnText: {
|
||||
fontSize: 13,
|
||||
fontFamily: "Inter_500Medium",
|
||||
},
|
||||
submitBtn: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
gap: 8,
|
||||
paddingVertical: 14,
|
||||
borderRadius: 14,
|
||||
marginTop: 4,
|
||||
},
|
||||
submitText: {
|
||||
fontSize: 15,
|
||||
fontFamily: "Inter_600SemiBold",
|
||||
},
|
||||
container: { paddingHorizontal: 16, gap: 14 },
|
||||
centered: { flex: 1, alignItems: "center", justifyContent: "center", gap: 10 },
|
||||
textArea: { borderRadius: 14, borderWidth: 1, padding: 14, minHeight: 140 },
|
||||
textInput: { fontSize: 15, fontFamily: "Inter_400Regular", lineHeight: 22, minHeight: 100 },
|
||||
charCountRow: { flexDirection: "row", justifyContent: "flex-end", alignItems: "center", gap: 6, marginTop: 4 },
|
||||
charCountLabel: { fontSize: 10, fontFamily: "Inter_400Regular" },
|
||||
charCount: { fontSize: 11, fontFamily: "Inter_400Regular" },
|
||||
draftBanner: { flexDirection: "row", alignItems: "center", gap: 8, paddingHorizontal: 14, paddingVertical: 10, borderRadius: 12, borderWidth: 1 },
|
||||
draftBannerText: { flex: 1, fontSize: 13, fontFamily: "Inter_400Regular" },
|
||||
draftBannerAction: { fontSize: 13, fontFamily: "Inter_600SemiBold" },
|
||||
draftBtn: { flexDirection: "row", alignItems: "center", justifyContent: "center", gap: 6, paddingVertical: 10, borderRadius: 12, borderWidth: 1 },
|
||||
draftBtnText: { fontSize: 13, fontFamily: "Inter_500Medium" },
|
||||
imageRow: { gap: 10, paddingRight: 4 },
|
||||
imageThumbWrap: { position: "relative" },
|
||||
imageThumb: { width: 100, height: 100, borderRadius: 10, borderWidth: 1 },
|
||||
removeImg: { position: "absolute", top: 4, right: 4, width: 20, height: 20, borderRadius: 10, alignItems: "center", justifyContent: "center" },
|
||||
uploadedBadge: { position: "absolute", bottom: 4, left: 4, width: 16, height: 16, borderRadius: 8, alignItems: "center", justifyContent: "center" },
|
||||
mediaBtnsRow: { flexDirection: "row", gap: 8 },
|
||||
mediaBtn: { flexDirection: "row", alignItems: "center", gap: 8, paddingHorizontal: 14, paddingVertical: 10, borderRadius: 10, borderWidth: 1 },
|
||||
mediaBtnText: { fontSize: 13, fontFamily: "Inter_500Medium" },
|
||||
sectionLabel: { fontSize: 11, fontFamily: "Inter_600SemiBold", letterSpacing: 0.8, marginBottom: -6 },
|
||||
sectionTitle: { fontSize: 18, fontFamily: "Inter_600SemiBold" },
|
||||
hint: { fontSize: 13, fontFamily: "Inter_400Regular", textAlign: "center" },
|
||||
channelList: { flexDirection: "row", gap: 8, flexWrap: "wrap" },
|
||||
scheduleRow: { flexDirection: "row", alignItems: "center", justifyContent: "space-between", paddingHorizontal: 16, paddingVertical: 12, borderRadius: 12, borderWidth: 1 },
|
||||
scheduleRowLeft: { flexDirection: "row", alignItems: "center", gap: 10 },
|
||||
scheduleLabel: { fontSize: 15, fontFamily: "Inter_500Medium" },
|
||||
dateTimeRow: { flexDirection: "row", gap: 10 },
|
||||
dateBtn: { flex: 1, flexDirection: "row", alignItems: "center", gap: 8, paddingHorizontal: 12, paddingVertical: 10, borderRadius: 10, borderWidth: 1 },
|
||||
dateBtnText: { fontSize: 13, fontFamily: "Inter_500Medium" },
|
||||
submitBtn: { flexDirection: "row", alignItems: "center", justifyContent: "center", gap: 8, paddingVertical: 14, borderRadius: 14, marginTop: 4 },
|
||||
submitText: { fontSize: 15, fontFamily: "Inter_600SemiBold" },
|
||||
});
|
||||
|
||||
@@ -22,6 +22,7 @@ import { PostCard } from "@/components/PostCard";
|
||||
import { PostizPost, usePostiz } from "@/context/PostizContext";
|
||||
import { useColors } from "@/hooks/useColors";
|
||||
import { extractError } from "@/lib/extractError";
|
||||
import { stripHtml } from "@/lib/stripHtml";
|
||||
|
||||
const SORT_STORAGE_KEY = "postiz_posts_sort";
|
||||
|
||||
@@ -154,7 +155,7 @@ export default function PostsScreen() {
|
||||
router.push({
|
||||
pathname: "/(tabs)/compose",
|
||||
params: {
|
||||
prefillContent: post.content,
|
||||
prefillContent: stripHtml(post.content),
|
||||
prefillIntegrationIds: integrations.map((i) => i.id).join(","),
|
||||
},
|
||||
});
|
||||
@@ -193,14 +194,15 @@ export default function PostsScreen() {
|
||||
const showContextMenu = (post: PostizPost) => {
|
||||
Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Medium);
|
||||
|
||||
const preview = post.content.slice(0, 60) + (post.content.length > 60 ? "…" : "");
|
||||
const plain = stripHtml(post.content);
|
||||
const preview = plain.slice(0, 60) + (plain.length > 60 ? "…" : "");
|
||||
|
||||
const buttons: Array<{ text: string; style?: "cancel" | "destructive" | "default"; onPress?: () => void }> = [];
|
||||
|
||||
buttons.push({
|
||||
text: "Copy text",
|
||||
onPress: async () => {
|
||||
await Clipboard.setStringAsync(post.content);
|
||||
await Clipboard.setStringAsync(stripHtml(post.content));
|
||||
Haptics.notificationAsync(Haptics.NotificationFeedbackType.Success);
|
||||
setCopyToast(true);
|
||||
setTimeout(() => setCopyToast(false), 2000);
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 652 KiB After Width: | Height: | Size: 49 KiB |
@@ -0,0 +1,209 @@
|
||||
import { Feather } from "@expo/vector-icons";
|
||||
import { Image } from "expo-image";
|
||||
import React, { useCallback, useEffect, useState } from "react";
|
||||
import {
|
||||
ActivityIndicator,
|
||||
FlatList,
|
||||
Modal,
|
||||
StyleSheet,
|
||||
Text,
|
||||
TouchableOpacity,
|
||||
View,
|
||||
} from "react-native";
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context";
|
||||
import { useColors } from "@/hooks/useColors";
|
||||
|
||||
interface MediaItem {
|
||||
id: string;
|
||||
path: string;
|
||||
createdAt?: string;
|
||||
}
|
||||
|
||||
interface Props {
|
||||
visible: boolean;
|
||||
baseUrl: string;
|
||||
apiKey: string;
|
||||
maxSelect: number;
|
||||
onClose: () => void;
|
||||
onSelect: (items: MediaItem[]) => void;
|
||||
}
|
||||
|
||||
function resolveUrl(path: string, baseUrl: string): string {
|
||||
if (path.startsWith("http://") || path.startsWith("https://")) return path;
|
||||
const origin = baseUrl.replace(/\/api\/.*$/, "");
|
||||
return `${origin}/${path.replace(/^\//, "")}`;
|
||||
}
|
||||
|
||||
export function MediaLibraryModal({ visible, baseUrl, apiKey, maxSelect, onClose, onSelect }: Props) {
|
||||
const colors = useColors();
|
||||
const insets = useSafeAreaInsets();
|
||||
const [items, setItems] = useState<MediaItem[]>([]);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [selected, setSelected] = useState<Set<string>>(new Set());
|
||||
|
||||
const load = useCallback(async () => {
|
||||
if (!baseUrl || !apiKey) return;
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
try {
|
||||
// eslint-disable-next-line no-undef
|
||||
const res = await globalThis.fetch(`${baseUrl}/media`, {
|
||||
headers: { Authorization: apiKey },
|
||||
});
|
||||
if (!res.ok) throw new Error(`HTTP ${res.status}`);
|
||||
const data = await res.json();
|
||||
const list: MediaItem[] = Array.isArray(data)
|
||||
? data
|
||||
: (data?.media ?? data?.items ?? data?.files ?? []);
|
||||
setItems(list);
|
||||
} catch (e: unknown) {
|
||||
setError(e instanceof Error ? e.message : "Failed to load media");
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
}, [baseUrl, apiKey]);
|
||||
|
||||
useEffect(() => {
|
||||
if (visible) {
|
||||
setSelected(new Set());
|
||||
load();
|
||||
}
|
||||
}, [visible, load]);
|
||||
|
||||
const toggle = (id: string) => {
|
||||
setSelected((prev) => {
|
||||
const next = new Set(prev);
|
||||
if (next.has(id)) {
|
||||
next.delete(id);
|
||||
} else if (next.size < maxSelect) {
|
||||
next.add(id);
|
||||
}
|
||||
return next;
|
||||
});
|
||||
};
|
||||
|
||||
const handleConfirm = () => {
|
||||
const chosen = items.filter((i) => selected.has(i.id));
|
||||
onSelect(chosen);
|
||||
};
|
||||
|
||||
return (
|
||||
<Modal visible={visible} animationType="slide" onRequestClose={onClose}>
|
||||
<View style={[styles.root, { backgroundColor: colors.background, paddingTop: insets.top }]}>
|
||||
<View style={[styles.header, { borderBottomColor: colors.border }]}>
|
||||
<TouchableOpacity onPress={onClose} activeOpacity={0.7} style={styles.closeBtn}>
|
||||
<Feather name="x" size={20} color={colors.foreground} />
|
||||
</TouchableOpacity>
|
||||
<Text style={[styles.title, { color: colors.foreground }]}>Media Library</Text>
|
||||
<TouchableOpacity
|
||||
onPress={handleConfirm}
|
||||
disabled={selected.size === 0}
|
||||
activeOpacity={0.8}
|
||||
style={[
|
||||
styles.addBtn,
|
||||
{ backgroundColor: selected.size > 0 ? colors.primary : colors.muted },
|
||||
]}
|
||||
>
|
||||
<Text style={[styles.addBtnText, { color: colors.primaryForeground }]}>
|
||||
{selected.size > 0 ? `Add ${selected.size}` : "Add"}
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
|
||||
{loading ? (
|
||||
<View style={styles.centered}>
|
||||
<ActivityIndicator color={colors.primary} size="large" />
|
||||
</View>
|
||||
) : error ? (
|
||||
<View style={styles.centered}>
|
||||
<Feather name="alert-circle" size={28} color={colors.error} />
|
||||
<Text style={[styles.errorText, { color: colors.mutedForeground }]}>{error}</Text>
|
||||
<TouchableOpacity
|
||||
onPress={load}
|
||||
style={[styles.retryBtn, { backgroundColor: colors.primary }]}
|
||||
activeOpacity={0.8}
|
||||
>
|
||||
<Text style={[styles.retryText, { color: colors.primaryForeground }]}>Retry</Text>
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
) : items.length === 0 ? (
|
||||
<View style={styles.centered}>
|
||||
<Feather name="image" size={36} color={colors.mutedForeground} />
|
||||
<Text style={[styles.emptyText, { color: colors.mutedForeground }]}>No media found</Text>
|
||||
</View>
|
||||
) : (
|
||||
<FlatList
|
||||
data={items}
|
||||
keyExtractor={(item) => item.id}
|
||||
numColumns={3}
|
||||
contentContainerStyle={[styles.grid, { paddingBottom: insets.bottom + 16 }]}
|
||||
renderItem={({ item }) => {
|
||||
const isSelected = selected.has(item.id);
|
||||
const uri = resolveUrl(item.path, baseUrl);
|
||||
return (
|
||||
<TouchableOpacity
|
||||
onPress={() => toggle(item.id)}
|
||||
activeOpacity={0.8}
|
||||
style={styles.cell}
|
||||
>
|
||||
<Image
|
||||
source={{ uri }}
|
||||
style={styles.cellImage}
|
||||
contentFit="cover"
|
||||
/>
|
||||
{isSelected && (
|
||||
<View style={[styles.selectedOverlay, { backgroundColor: colors.primary + "99" }]}>
|
||||
<View style={[styles.checkCircle, { backgroundColor: colors.primary }]}>
|
||||
<Feather name="check" size={14} color="#fff" />
|
||||
</View>
|
||||
</View>
|
||||
)}
|
||||
</TouchableOpacity>
|
||||
);
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</View>
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
|
||||
const CELL = 120;
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
root: { flex: 1 },
|
||||
header: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
paddingHorizontal: 16,
|
||||
paddingVertical: 14,
|
||||
borderBottomWidth: StyleSheet.hairlineWidth,
|
||||
gap: 12,
|
||||
},
|
||||
closeBtn: { padding: 4 },
|
||||
title: { flex: 1, fontSize: 17, fontFamily: "Inter_600SemiBold" },
|
||||
addBtn: { paddingHorizontal: 16, paddingVertical: 8, borderRadius: 20 },
|
||||
addBtnText: { fontSize: 14, fontFamily: "Inter_600SemiBold" },
|
||||
centered: { flex: 1, alignItems: "center", justifyContent: "center", gap: 12 },
|
||||
errorText: { fontSize: 14, fontFamily: "Inter_400Regular", textAlign: "center", paddingHorizontal: 32 },
|
||||
emptyText: { fontSize: 14, fontFamily: "Inter_400Regular" },
|
||||
retryBtn: { paddingHorizontal: 20, paddingVertical: 10, borderRadius: 10 },
|
||||
retryText: { fontSize: 14, fontFamily: "Inter_600SemiBold" },
|
||||
grid: { padding: 2 },
|
||||
cell: { width: CELL, height: CELL, margin: 2 },
|
||||
cellImage: { width: CELL, height: CELL, borderRadius: 4 },
|
||||
selectedOverlay: {
|
||||
...StyleSheet.absoluteFillObject,
|
||||
borderRadius: 4,
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
},
|
||||
checkCircle: {
|
||||
width: 28,
|
||||
height: 28,
|
||||
borderRadius: 14,
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
},
|
||||
});
|
||||
@@ -12,6 +12,7 @@ import {
|
||||
import { Swipeable } from "react-native-gesture-handler";
|
||||
import { useColors } from "@/hooks/useColors";
|
||||
import { PostizPost } from "@/context/PostizContext";
|
||||
import { stripHtml } from "@/lib/stripHtml";
|
||||
import { StatusBadge } from "./StatusBadge";
|
||||
|
||||
interface PostCardProps {
|
||||
@@ -118,10 +119,11 @@ export function PostCard({ post, onDelete, onLongPress, onReschedule }: PostCard
|
||||
: undefined;
|
||||
|
||||
const integrations = post.integrations ?? (post.integration ? [post.integration] : []);
|
||||
const plainContent = stripHtml(post.content);
|
||||
const truncatedContent =
|
||||
post.content.length > 140
|
||||
? post.content.slice(0, 140) + "…"
|
||||
: post.content;
|
||||
plainContent.length > 140
|
||||
? plainContent.slice(0, 140) + "…"
|
||||
: plainContent;
|
||||
|
||||
return (
|
||||
<Swipeable
|
||||
|
||||
@@ -2,6 +2,7 @@ import { useCallback, useEffect, useRef } from "react";
|
||||
import { Platform } from "react-native";
|
||||
import { usePostiz } from "@/context/PostizContext";
|
||||
import { PostizPost } from "@/context/PostizContext";
|
||||
import { stripHtml } from "@/lib/stripHtml";
|
||||
|
||||
const POLL_INTERVAL_MS = 15 * 60 * 1000;
|
||||
const SEEN_KEY = "postiz_seen_statuses";
|
||||
@@ -44,10 +45,7 @@ async function sendStatusNotification(post: PostizPost) {
|
||||
await Notifications.scheduleNotificationAsync({
|
||||
content: {
|
||||
title: isError ? "Post failed to publish" : "Post published!",
|
||||
body:
|
||||
post.content.length > 80
|
||||
? post.content.slice(0, 80) + "…"
|
||||
: post.content,
|
||||
body: (() => { const t = stripHtml(post.content); return t.length > 80 ? t.slice(0, 80) + "…" : t; })(),
|
||||
data: { postId: post.id },
|
||||
},
|
||||
trigger: null,
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
export function stripHtml(html: string): string {
|
||||
// Decode entities first so encoded tags like <p> are also stripped
|
||||
let s = html
|
||||
.replace(/&/g, "&")
|
||||
.replace(/</g, "<")
|
||||
.replace(/>/g, ">")
|
||||
.replace(/"/g, '"')
|
||||
.replace(/'/g, "'")
|
||||
.replace(/ /g, " ");
|
||||
// Block-level tags → newlines
|
||||
s = s
|
||||
.replace(/<br\s*\/?>/gi, "\n")
|
||||
.replace(/<\/p>/gi, "\n")
|
||||
.replace(/<\/div>/gi, "\n")
|
||||
.replace(/<\/li>/gi, "\n");
|
||||
// Strip all remaining tags
|
||||
s = s.replace(/<[^>]+>/g, "");
|
||||
return s.replace(/\n{3,}/g, "\n\n").trim();
|
||||
}
|
||||
@@ -33,6 +33,7 @@
|
||||
"expo-glass-effect": "~0.1.4",
|
||||
"expo-haptics": "~15.0.8",
|
||||
"expo-image": "~3.0.11",
|
||||
"expo-image-manipulator": "~13.0.6",
|
||||
"expo-image-picker": "~17.0.9",
|
||||
"expo-linear-gradient": "~15.0.8",
|
||||
"expo-linking": "~8.0.10",
|
||||
|
||||
Reference in New Issue
Block a user