Merge pull request #74 from naari3/delete-isss

Delete implementation of isSs
naari3 · Mar 31, 2021 · 0241229 · 0241229 · vercel · Mar 31, 2021
2 parents acd0d49 + dda4db7
commit 0241229
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 73 deletions.
diff --git a/components/IsSsLink.tsx b/components/IsSsLink.tsx
diff --git a/components/Pager.tsx b/components/Pager.tsx
@@ -58,7 +58,7 @@ const Pager: FC = () => {
     const actualMaxPageNum = actualMaxPageNumber(
       options.per,
       options.count,
-      options.isSs ? MAX_SS_OFFSET : MAX_OFFSET
+      MAX_SS_OFFSET
     );
     setHasPrevPrevPage(options.page > 2);
     setHasPrevPage(options.page > 1);

diff --git a/components/SearchBar.tsx b/components/SearchBar.tsx
@@ -4,7 +4,6 @@ import styles from "./SearchBar.module.css";
 import removeEmpty from "../lib/removeEmpty";
 import parseLimitedFloat from "../lib/parseLimitedFloat";
 import * as gtag from "../lib/gtag";
-import IsSsLink from "./IsSsLink";
 
 import {
   useDispatch as useSearchDispatch,
@@ -109,12 +108,6 @@ const SearchBar: FC = () => {
                 {options.count.toLocaleString()} {t("results")}
               </span>
             )}
-            <span className={styles.ss}>
-              <IsSsLink
-                disableMessage={t("disable-ss")}
-                enableMessage={t("enable-ss")}
-              />
-            </span>
             {takesALongTime ? (
               <div>
                 <span>{t("search-firsttime")}</span>
@@ -143,29 +136,28 @@ const SearchBar: FC = () => {
               </option>
             ))}
           </select>
-          {options.isSs ? (
+          {
             ""
-          ) : (
-            <>
-              <span className={styles.filterName}>{t("user-id-filter")}</span>
-              <label>
-                <input
-                  className={`${styles.inputNumber} ${styles.big}`}
-                  type="number"
-                  min="0"
-                  value={options.userId || ""}
-                  onChange={(e) => {
-                    searchDispatch({
-                      type: "update",
-                      payload: {
-                        userId: parseInt(e.target.value),
-                      },
-                    });
-                  }}
-                />
-              </label>
-            </>
-          )}
+            // <>
+            //   <span className={styles.filterName}>{t("user-id-filter")}</span>
+            //   <label>
+            //     <input
+            //       className={`${styles.inputNumber} ${styles.big}`}
+            //       type="number"
+            //       min="0"
+            //       value={options.userId || ""}
+            //       onChange={(e) => {
+            //         searchDispatch({
+            //           type: "update",
+            //           payload: {
+            //             userId: parseInt(e.target.value),
+            //           },
+            //         });
+            //       }}
+            //     />
+            //   </label>
+            // </>
+          }
         </div>
         <div className={styles.filter}>
           <span className={styles.filterName}>{t("my-list-count")}</span>

diff --git a/pages_/search.tsx b/pages_/search.tsx
@@ -256,8 +256,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => {
   if (viewing !== "detail" && viewing !== "icon") viewing = "detail";
   if (!per) per = 50;
   const { query } = ctx;
-  const isSs = !!query.isSs;
-  const client = new (isSs ? VideoSnapshotClient : VideoClient)({
+  const client = new VideoSnapshotClient({
     context: "otomad-search",
   });
   console.log(query);
@@ -279,7 +278,6 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => {
     startTimeLte: roundDate(parseQueryToString(query.startTimeLte)),
     page: roundNumber(parseQueryToInt(query.page)),
     per: Math.min(100, roundNumber(parseQueryToInt(query.per)) || per),
-    isSs,
   };
   console.log({
     cookie: per,
@@ -292,7 +290,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => {
   > => {
     if (shouldExecCall(searchOptions)) {
       const searchQuery = getSearchQuery(searchOptions);
-      if (searchQuery._offset > (isSs ? MAX_SS_OFFSET : MAX_OFFSET)) {
+      if (searchQuery._offset > MAX_SS_OFFSET) {
         searchQuery._offset = 0;
         searchQuery._limit = 0;
       }
@@ -327,7 +325,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => {
   const actualMaxPageNum = actualMaxPageNumber(
     searchOptions.per,
     response.meta.totalCount,
-    isSs ? MAX_SS_OFFSET : MAX_OFFSET
+    MAX_SS_OFFSET
   );
 
   if (actualMaxPageNum < searchOptions.page) {
@@ -344,7 +342,6 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => {
           !!searchOptions.page || searchOptions.page < 0
             ? searchOptions.page
             : 1,
-        isSs: searchOptions.isSs ? true : null,
       },
       viewing,
     },

diff --git a/reducers/search.ts b/reducers/search.ts
@@ -13,7 +13,6 @@ export type SearchOptions = {
   count?: number;
   page?: number;
   per?: number;
-  isSs?: boolean;
 };
 
 export const initialState: SearchOptions = { _sort: "-startTime" };