diff --git a/packages/app/config/default.json b/packages/app/config/default.json index 706423ab..659ea8e6 100644 --- a/packages/app/config/default.json +++ b/packages/app/config/default.json @@ -23,6 +23,9 @@ "moderation": true, "defaultFollows": ["npub1sn0rtcjcf543gj4wsg7fa59s700d5ztys5ctj0g69g2x6802npjqhjjtws"] }, + "defaultPreferences": { + "hideMutedNotes": false + }, "media": { "bypassImgProxyError": false, "preferLargeMedia": true diff --git a/packages/app/config/iris.json b/packages/app/config/iris.json index 98f2c863..bf75342f 100644 --- a/packages/app/config/iris.json +++ b/packages/app/config/iris.json @@ -19,6 +19,9 @@ "notificationGraph": false, "communityLeaders": true }, + "defaultPreferences": { + "hideMutedNotes": true + }, "signUp": { "moderation": false, "defaultFollows": ["npub1wnwwcv0a8wx0m9stck34ajlwhzuua68ts8mw3kjvspn42dcfyjxs4n95l8"] diff --git a/packages/app/custom.d.ts b/packages/app/custom.d.ts index a62b5af9..342ac905 100644 --- a/packages/app/custom.d.ts +++ b/packages/app/custom.d.ts @@ -61,7 +61,7 @@ declare const CONFIG: { communityLeaders: boolean; }; defaultPreferences: { - checkSigs: boolean; + hideMutedNotes: boolean; }; signUp: { moderation: boolean; diff --git a/packages/app/src/Components/Event/EventComponent.css b/packages/app/src/Components/Event/EventComponent.css index bfcd477b..e977f763 100644 --- a/packages/app/src/Components/Event/EventComponent.css +++ b/packages/app/src/Components/Event/EventComponent.css @@ -99,6 +99,10 @@ z-index: 1; } +.reaction-pill { + user-select: none; +} + .reaction-pill:not(.reacted):not(:hover) { color: var(--font-secondary-color); } diff --git a/packages/app/src/Pages/settings/Preferences.tsx b/packages/app/src/Pages/settings/Preferences.tsx index 5b6ff3ce..9f13d6a8 100644 --- a/packages/app/src/Pages/settings/Preferences.tsx +++ b/packages/app/src/Pages/settings/Preferences.tsx @@ -13,7 +13,7 @@ import messages from "./messages"; const PreferencesPage = () => { const { formatMessage } = useIntl(); - const { id, perf } = useLogin(s => ({ id: s.id, perf: s.appData.item.preferences })); + const { id, pref } = useLogin(s => ({ id: s.id, pref: s.appData.item.preferences })); const { lang } = useLocale(); return ( @@ -31,7 +31,7 @@ const PreferencesPage = () => { value={lang} onChange={e => updatePreferences(id, { - ...perf, + ...pref, language: e.target.value, }) } @@ -52,10 +52,10 @@ const PreferencesPage = () => {
updatePreferences(id, { - ...perf, + ...pref, defaultRootTab: e.target.value, } as UserPreferences) }> @@ -108,8 +108,8 @@ const PreferencesPage = () => {
updatePreferences(id, { ...perf, telemetry: e.target.checked })} + checked={pref.telemetry ?? true} + onChange={e => updatePreferences(id, { ...pref, telemetry: e.target.checked })} />
@@ -124,10 +124,10 @@ const PreferencesPage = () => {
updatePreferences(id, { ...perf, checkSigs: e.target.checked })} + checked={pref.checkSigs} + onChange={e => updatePreferences(id, { ...pref, checkSigs: e.target.checked })} />
@@ -173,8 +173,8 @@ const PreferencesPage = () => {
updatePreferences(id, { ...perf, autoTranslate: e.target.checked })} + checked={pref.autoTranslate} + onChange={e => updatePreferences(id, { ...pref, autoTranslate: e.target.checked })} />
@@ -190,9 +190,9 @@ const PreferencesPage = () => {
updatePreferences(id, { ...perf, pow: parseInt(e.target.value || "0") })} + onChange={e => updatePreferences(id, { ...pref, pow: parseInt(e.target.value || "0") })} />
@@ -203,9 +203,9 @@ const PreferencesPage = () => {
updatePreferences(id, { ...perf, defaultZapAmount: parseInt(e.target.value || "0") })} + onChange={e => updatePreferences(id, { ...pref, defaultZapAmount: parseInt(e.target.value || "0") })} />
@@ -221,8 +221,8 @@ const PreferencesPage = () => {
updatePreferences(id, { ...perf, showBadges: e.target.checked })} + checked={pref.showBadges ?? false} + onChange={e => updatePreferences(id, { ...pref, showBadges: e.target.checked })} />
@@ -238,8 +238,8 @@ const PreferencesPage = () => {
updatePreferences(id, { ...perf, showStatus: e.target.checked })} + checked={pref.showStatus ?? true} + onChange={e => updatePreferences(id, { ...pref, showStatus: e.target.checked })} />
@@ -255,8 +255,8 @@ const PreferencesPage = () => {
updatePreferences(id, { ...perf, autoZap: e.target.checked })} + checked={pref.autoZap} + onChange={e => updatePreferences(id, { ...pref, autoZap: e.target.checked })} />
@@ -273,17 +273,17 @@ const PreferencesPage = () => {
updatePreferences(id, { - ...perf, + ...pref, imgProxyConfig: e.target.checked ? DefaultImgProxy : undefined, }) } />
- {perf.imgProxyConfig && ( + {pref.imgProxyConfig && (
@@ -292,7 +292,7 @@ const PreferencesPage = () => {
{ })} onChange={e => updatePreferences(id, { - ...perf, + ...pref, imgProxyConfig: { - ...unwrap(perf.imgProxyConfig), + ...unwrap(pref.imgProxyConfig), url: e.target.value, }, }) @@ -317,7 +317,7 @@ const PreferencesPage = () => {
{ })} onChange={e => updatePreferences(id, { - ...perf, + ...pref, imgProxyConfig: { - ...unwrap(perf.imgProxyConfig), + ...unwrap(pref.imgProxyConfig), key: e.target.value, }, }) @@ -342,7 +342,7 @@ const PreferencesPage = () => {
{ })} onChange={e => updatePreferences(id, { - ...perf, + ...pref, imgProxyConfig: { - ...unwrap(perf.imgProxyConfig), + ...unwrap(pref.imgProxyConfig), salt: e.target.value, }, }) @@ -375,8 +375,8 @@ const PreferencesPage = () => {
updatePreferences(id, { ...perf, enableReactions: e.target.checked })} + checked={pref.enableReactions} + onChange={e => updatePreferences(id, { ...pref, enableReactions: e.target.checked })} />
@@ -389,11 +389,11 @@ const PreferencesPage = () => { { const split = e.target.value.match(/[\p{L}\S]{1}/u); updatePreferences(id, { - ...perf, + ...pref, reactionEmoji: split?.[0] ?? "", }); }} @@ -411,8 +411,8 @@ const PreferencesPage = () => {
updatePreferences(id, { ...perf, confirmReposts: e.target.checked })} + checked={pref.confirmReposts} + onChange={e => updatePreferences(id, { ...pref, confirmReposts: e.target.checked })} />
@@ -428,8 +428,8 @@ const PreferencesPage = () => {
updatePreferences(id, { ...perf, autoShowLatest: e.target.checked })} + checked={pref.autoShowLatest} + onChange={e => updatePreferences(id, { ...pref, autoShowLatest: e.target.checked })} />
@@ -441,10 +441,10 @@ const PreferencesPage = () => { updatePreferences(id, { ...perf, showDebugMenus: e.target.checked })} + checked={pref.showDebugMenus} + onChange={e => updatePreferences(id, { ...pref, showDebugMenus: e.target.checked })} />
@@ -486,8 +486,8 @@ const PreferencesPage = () => {
updatePreferences(id, { ...perf, hideMutedNotes: e.target.checked })} + checked={pref.hideMutedNotes} + onChange={e => updatePreferences(id, { ...pref, hideMutedNotes: e.target.checked })} />
diff --git a/packages/app/src/Utils/Login/Preferences.ts b/packages/app/src/Utils/Login/Preferences.ts index 3cf3f3a8..efde0361 100644 --- a/packages/app/src/Utils/Login/Preferences.ts +++ b/packages/app/src/Utils/Login/Preferences.ts @@ -122,4 +122,5 @@ export const DefaultPreferences = { checkSigs: true, autoTranslate: true, hideMutedNotes: false, + ...CONFIG.defaultPreferences } as UserPreferences;