Merge 99e5c1036d into 7376cb1e99

It's not a poll if there's only 1 option

src/components/compose.jsx

@@ -131,7 +131,7 @@ const HASHTAG_RE = new RegExp(
 // https://github.com/mastodon/mastodon/blob/23e32a4b3031d1da8b911e0145d61b4dd47c4f96/app/models/custom_emoji.rb#L31
 const SHORTCODE_RE_FRAGMENT = '[a-zA-Z0-9_]{2,}';
 const SCAN_RE = new RegExp(
-  `([^A-Za-z0-9_:\\n]|^)(:${SHORTCODE_RE_FRAGMENT}:)(?=[^A-Za-z0-9_:]|$)`,
+  `(^|[^=\\/\\w])(:${SHORTCODE_RE_FRAGMENT}:)(?=[^A-Za-z0-9_:]|$)`,
   'g',
 );
 
@@ -1219,22 +1219,30 @@ function Compose({
                 />
                 <Icon icon="attachment" />
               </label>{' '}
-              <button
-                type="button"
-                class="toolbar-button"
-                disabled={
-                  uiState === 'loading' || !!poll || !!mediaAttachments.length
-                }
-                onClick={() => {
-                  setPoll({
-                    options: ['', ''],
-                    expiresIn: 24 * 60 * 60, // 1 day
-                    multiple: false,
-                  });
-                }}
-              >
-                <Icon icon="poll" alt="Add poll" />
-              </button>{' '}
+              {/* If maxOptions is not defined or defined and is greater than 1, show poll button */}
+              {maxOptions == null ||
+                (maxOptions > 1 && (
+                  <>
+                    <button
+                      type="button"
+                      class="toolbar-button"
+                      disabled={
+                        uiState === 'loading' ||
+                        !!poll ||
+                        !!mediaAttachments.length
+                      }
+                      onClick={() => {
+                        setPoll({
+                          options: ['', ''],
+                          expiresIn: 24 * 60 * 60, // 1 day
+                          multiple: false,
+                        });
+                      }}
+                    >
+                      <Icon icon="poll" alt="Add poll" />
+                    </button>{' '}
+                  </>
+                ))}
               <button
                 type="button"
                 class="toolbar-button"
@@ -2374,6 +2382,10 @@ function GIFPickerModal({ onClose = () => {}, onSelect = () => {} }) {
     qRef.current?.focus();
   }, []);
 
+  const debouncedOnInput = useDebouncedCallback(() => {
+    fetchGIFs({ offset: 0 });
+  }, 1000);
+
   return (
     <div id="gif-picker-sheet" class="sheet">
       {!!onClose && (
@@ -2400,6 +2412,7 @@ function GIFPickerModal({ onClose = () => {}, onSelect = () => {} }) {
             autocapitalize="off"
             spellCheck="false"
             dir="auto"
+            onInput={debouncedOnInput}
           />
           <input
             type="image"

src/components/media.jsx

@@ -388,7 +388,7 @@ function Media({
       data-orientation="${orientation}"
       preload="auto"
       autoplay
-      muted="${isGIF}"
+      ${isGIF ? 'muted' : ''}
       ${isGIF ? '' : 'controls'}
       playsinline
       loop="${loopable}"

src/components/relative-time.jsx

@@ -21,6 +21,7 @@ export default function RelativeTime({ datetime, format }) {
   const [renderCount, rerender] = useReducer((x) => x + 1, 0);
   const date = useMemo(() => dayjs(datetime), [datetime]);
   const [dateStr, dt, title] = useMemo(() => {
+    if (!date.isValid()) return ['' + datetime, '', ''];
     let str;
     if (format === 'micro') {
       // If date <= 1 day ago or day is within this year
@@ -37,6 +38,7 @@ export default function RelativeTime({ datetime, format }) {
   }, [date, format, renderCount]);
 
   useEffect(() => {
+    if (!date.isValid()) return;
     let timeout;
     let raf;
     function rafRerender() {

src/pages/login.jsx

@@ -12,7 +12,7 @@ import { getAuthorizationURL, registerApplication } from '../utils/auth';
 import store from '../utils/store';
 import useTitle from '../utils/useTitle';
 
-const { PHANPY_DEFAULT_INSTANCE: DEFAULT_INSTANCE } = import.meta.env;
+const { PHANPY_DEFAULT_INSTANCE: DEFAULT_INSTANCE, PHANPY_SCHEME: SCHEME = 'https' } = import.meta.env;
 
 function Login() {
   useTitle('Log in');
@@ -85,9 +85,11 @@ function Login() {
         .replace(/^@?[^@]+@/, '') // Remove @?acct@
         .trim()
     : null;
-  const instanceTextLooksLikeDomain =
-    /[^\s\r\n\t\/\\]+\.[^\s\r\n\t\/\\]+/.test(cleanInstanceText) &&
-    !/[\s\/\\@]/.test(cleanInstanceText);
+  const instanceTextLooksLikeDomain = 
+    (/[^\s\r\n\t\/\\]+\.[^\s\r\n\t\/\\]+/.test(cleanInstanceText) &&
+    !/[\s\/\\@]/.test(cleanInstanceText)) || SCHEME === "http";
+
+  console.log(SCHEME)
 
   const instancesSuggestions = cleanInstanceText
     ? instancesList

src/pages/mentions.jsx

@@ -4,6 +4,7 @@ import { useSearchParams } from 'react-router-dom';
 import Link from '../components/link';
 import Timeline from '../components/timeline';
 import { api } from '../utils/api';
+import { fixNotifications } from '../utils/group-notifications';
 import { saveStatus } from '../utils/states';
 import useTitle from '../utils/useTitle';
 
@@ -30,6 +31,8 @@ function Mentions({ columnMode, ...props }) {
     const results = await mentionsIterator.current.next();
     let { value } = results;
     if (value?.length) {
+      value = fixNotifications(value);
+
       if (firstLoad) {
         latestItem.current = value[0].id;
         console.log('First load', latestItem.current);

src/utils/api.js

@@ -10,6 +10,8 @@ import {
   setCurrentAccountID,
 } from './store-utils';
 
+const { PHANPY_SCHEME: SCHEME = 'https' } = import.meta.env;
+
 // Default *fallback* instance
 const DEFAULT_INSTANCE = 'mastodon.social';
 
@@ -37,7 +39,9 @@ export function initClient({ instance, accessToken }) {
       .replace(/\/+$/, '')
       .toLowerCase();
   }
-  const url = instance ? `https://${instance}` : `https://${DEFAULT_INSTANCE}`;
+  const url = instance
+    ? `${SCHEME}://${instance}`
+    : `${SCHEME}://${DEFAULT_INSTANCE}`;
 
   const masto = createRestAPIClient({
     url,

src/utils/auth.js

@@ -1,5 +1,8 @@
-const { PHANPY_CLIENT_NAME: CLIENT_NAME, PHANPY_WEBSITE: WEBSITE } = import.meta
-  .env;
+const {
+  PHANPY_CLIENT_NAME: CLIENT_NAME,
+  PHANPY_WEBSITE: WEBSITE,
+  PHANPY_SCHEME: SCHEME = 'https',
+} = import.meta.env;
 
 const SCOPES = 'read write follow push';
 
@@ -11,7 +14,7 @@ export async function registerApplication({ instanceURL }) {
     website: WEBSITE,
   });
   const registrationResponse = await fetch(
-    `https://${instanceURL}/api/v1/apps`,
+    `${SCHEME}://${instanceURL}/api/v1/apps`,
     {
       method: 'POST',
       headers: {
@@ -33,7 +36,7 @@ export async function getAuthorizationURL({ instanceURL, client_id }) {
     // redirect_uri: 'urn:ietf:wg:oauth:2.0:oob',
     response_type: 'code',
   });
-  const authorizationURL = `https://${instanceURL}/oauth/authorize?${authorizationParams.toString()}`;
+  const authorizationURL = `${SCHEME}://${instanceURL}/oauth/authorize?${authorizationParams.toString()}`;
   return authorizationURL;
 }
 
@@ -51,7 +54,7 @@ export async function getAccessToken({
     code,
     scope: SCOPES,
   });
-  const tokenResponse = await fetch(`https://${instanceURL}/oauth/token`, {
+  const tokenResponse = await fetch(`${SCHEME}://${instanceURL}/oauth/token`, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/x-www-form-urlencoded',

src/utils/group-notifications.jsx

@@ -9,7 +9,7 @@ const notificationTypeKeys = {
   poll: ['status'],
   update: ['status'],
 };
-function fixNotifications(notifications) {
+export function fixNotifications(notifications) {
   return notifications.filter((notification) => {
     const { type, id, createdAt } = notification;
     if (!type) {

src/utils/store-utils.js

@@ -107,10 +107,10 @@ export function getCurrentInstance() {
     return (currentInstance = instances[instance]);
   } catch (e) {
     console.error(e);
-    alert(`Failed to load instance configuration. Please try again.\n\n${e}`);
+    // alert(`Failed to load instance configuration. Please try again.\n\n${e}`);
     // Temporary fix for corrupted data
-    store.local.del('instances');
-    location.reload();
+    // store.local.del('instances');
+    // location.reload();
     return {};
   }
 }