Skip to content
Open
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
2 changes: 2 additions & 0 deletions src/components/ICONS.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,8 @@ export const ICONS = {
'user-x': () => import('@iconify-icons/mingcute/user-x-line'),
minimize: () => import('@iconify-icons/mingcute/arrows-down-line'),
celebrate: () => import('@iconify-icons/mingcute/celebrate-line'),
locked: () => import('@iconify-icons/mingcute/lock-fill'),
unlocked: () => import('@iconify-icons/mingcute/unlock-line'),
schedule: () => import('@iconify-icons/mingcute/calendar-time-add-line'),
day: () => import('@iconify-icons/mingcute/calendar-day-line'),
camera: () => import('@iconify-icons/mingcute/camera-line'),
Expand Down
42 changes: 41 additions & 1 deletion src/components/compose.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import emojifyText from '../utils/emojify-text';
import getDomain from '../utils/get-domain';
import i18nDuration from '../utils/i18n-duration';
import isRTL from '../utils/is-rtl';
import localPostingIconsMap from '../utils/local-posting-icons-map.js';
import localeMatch from '../utils/locale-match';
import localeCode2Text from '../utils/localeCode2Text';
import mem from '../utils/mem';
Expand Down Expand Up @@ -271,6 +272,7 @@ function Compose({
const spoilerTextRef = useRef();
const [visibility, setVisibility] = useState('public');
const [sensitive, setSensitive] = useState(false);
const [localOnly, setLocalOnly] = useState('federated');
const [language, setLanguage] = useState(
store.session.get('currentLanguage') || DEFAULT_LANG,
);
Expand Down Expand Up @@ -300,7 +302,11 @@ function Compose({

useEffect(() => {
if (replyToStatus) {
const { spoilerText, visibility, language, sensitive } = replyToStatus;
const { spoilerText, visibility, language, sensitive, localOnly } =
replyToStatus;
if (showLocalOnlyButton) {
setLocalOnly(localOnly ? 'local-instance' : 'federated');
}
if (spoilerText && spoilerTextRef.current) {
spoilerTextRef.current.value = spoilerText;
}
Expand Down Expand Up @@ -719,6 +725,13 @@ function Compose({
const [showMentionPicker, setShowMentionPicker] = useState(false);
const [showEmoji2Picker, setShowEmoji2Picker] = useState(false);
const [showGIFPicker, setShowGIFPicker] = useState(false);
const supportsLocalPosting = supports('@gotosocial/local-posting');
const [localPostingLabel, setLocalPostingLabel] = useState('');
const [showLocalOnlyButton, setShowLocalOnlyButton] =
useState(supportsLocalPosting);
if (supportsLocalPosting) {
setLocalPostingLabel(localOnly ? 'Local' : 'Federated');
}

const [autoDetectedLanguages, setAutoDetectedLanguages] = useState(null);
const [topSupportedLanguages, restSupportedLanguages] = useMemo(() => {
Expand Down Expand Up @@ -1167,6 +1180,9 @@ function Compose({
params.in_reply_to_id = replyToStatus?.id || undefined;
params.scheduled_at = scheduledAt;
}
if (supports('@gotosocial/local-posting')) {
params.local_only = localOnly === 'local-instance';
}
params = removeNullUndefined(params);
console.log('POST', params);

Expand Down Expand Up @@ -1254,6 +1270,30 @@ function Compose({
/>
<Icon icon={`eye-${sensitive ? 'close' : 'open'}`} />
</label>{' '}
{showLocalOnlyButton && (
<label class={`toolbar-button ${!sensitive ? 'show-field' : ''}`}>
<Icon
icon={localPostingIconsMap[localOnly]}
alt={localPostingLabel}
/>
<select
value={localOnly}
onChange={(e) => {
setLocalOnly(e.target.value);
setLocalPostingLabel(localOnly ? 'Local' : 'Federated');
}}
disabled={uiState === 'loading' || !!editStatus}
dir="auto"
>
<option value="local-instance">
<Trans>Local</Trans>
</option>
<option value="federated">
<Trans>Federated</Trans>
</option>
</select>
</label>
)}
<label
class={`toolbar-button ${
visibility !== 'public' && !sensitive ? 'show-field' : ''
Expand Down
8 changes: 8 additions & 0 deletions src/components/status.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,7 @@ function Status({
// _filtered,
// Non-Mastodon
emojiReactions,
localOnly,
} = status;

const [languageAutoDetected, setLanguageAutoDetected] = useState(null);
Expand Down Expand Up @@ -2210,6 +2211,13 @@ function Status({
</div>{' '}
</>
)}
{localOnly && (
<>
<div class="status-direct-badge">
<Trans>Local</Trans>
</div>{' '}
</>
)}
{!withinContext && (
<>
{isThread ? (
Expand Down
1 change: 1 addition & 0 deletions src/data/features.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"@mastodon/edit-media-attributes": ">=4.1",
"@mastodon/list-exclusive": ">=4.2",
"@gotosocial/list-exclusive": ">=0.17",
"@gotosocial/local-posting": ">=0.17",
"@mastodon/filtered-notifications": "~4.3 || >=4.3",
"@mastodon/fetch-multiple-statuses": "~4.3 || >=4.3",
"@mastodon/trending-link-posts": "~4.3 || >=4.3",
Expand Down
2 changes: 2 additions & 0 deletions src/locales/en.po

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

4 changes: 4 additions & 0 deletions src/utils/local-posting-icons-map.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export default {
'local-instance': 'locked',
federated: 'unlocked',
};
4 changes: 3 additions & 1 deletion src/utils/supports.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const platformFeatures = {
'@pixelfed/global-feed': containPixelfed,
'@pleroma/local-visibility-post': containPleroma,
'@akkoma/local-visibility-post': containAkkoma,
'@gotosocial/local-posting': containGTS,
};

const supportsCache = {};
Expand All @@ -44,7 +45,8 @@ function supports(feature) {
if (supportsCache[key]) return supportsCache[key];

if (platformFeatures[feature]) {
return (supportsCache[key] = platformFeatures[feature].test(version));
return (supportsCache[key] =
platformFeatures[feature].test(softwareName));
}

const range = features[feature];
Expand Down
Loading